1 files changed, 210 insertions, 222 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index dec08cfe2..439260d9d 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2015-05-04 02:30+0300\n"
+"POT-Creation-Date: 2015-05-07 01:20+0300\n"
 "PO-Revision-Date: 2015-04-06 11:05+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -40,124 +40,124 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:148 src/client.cpp:1465 src/client.cpp:1492
-#: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:158
-#: src/gui/dialogsmanager.cpp:174 src/gui/widgets/tabs/setup_input.cpp:164
+#: src/actions/actions.cpp:148 src/client.cpp:1473 src/client.cpp:1504
+#: src/gamemodifiers.cpp:439 src/gui/dialogsmanager.cpp:164
+#: src/gui/dialogsmanager.cpp:183 src/gui/widgets/tabs/setup_input.cpp:164
 #: src/gui/widgets/tabs/setup_theme.cpp:312
-#: src/gui/widgets/tabs/setup_theme.cpp:343
+#: src/gui/widgets/tabs/setup_theme.cpp:347
 #: src/gui/widgets/tabs/setup_video.cpp:250
-#: src/gui/widgets/tabs/setup_video.cpp:274
-#: src/gui/widgets/tabs/setup_video.cpp:389
-#: src/gui/widgets/tabs/setup_video.cpp:401
+#: src/gui/widgets/tabs/setup_video.cpp:277
+#: src/gui/widgets/tabs/setup_video.cpp:395
+#: src/gui/widgets/tabs/setup_video.cpp:410
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:380
-#: src/gui/windows/charselectdialog.cpp:278
-#: src/gui/windows/charselectdialog.cpp:320 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:280
+#: src/gui/windows/charselectdialog.cpp:325 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:59
 #: src/gui/windows/editserverdialog.cpp:217
 #: src/gui/windows/itemamountwindow.cpp:174 src/gui/windows/quitdialog.cpp:68
 #: src/gui/windows/registerdialog.cpp:243 src/gui/windows/socialwindow.cpp:507
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:146
-#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
-#: src/net/ea/gamehandler.cpp:83 src/net/eathena/charserverhandler.cpp:594
-#: src/net/eathena/charserverhandler.cpp:624
-#: src/net/eathena/charserverhandler.cpp:654
+#: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:165
+#: src/net/ea/gamehandler.cpp:83 src/net/eathena/charserverhandler.cpp:597
+#: src/net/eathena/charserverhandler.cpp:630
+#: src/net/eathena/charserverhandler.cpp:663
 #: src/net/tmwa/charserverhandler.cpp:523
 msgid "OK"
 msgstr "确定"
 
 #. TRANSLATORS: clear graphics command message
 #. TRANSLATORS: clear fonts cache message
-#: src/actions/actions.cpp:934 src/actions/actions.cpp:946
+#: src/actions/actions.cpp:937 src/actions/actions.cpp:949
 msgid "Cache cleaned"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1074 src/actions/actions.cpp:1130
+#: src/actions/actions.cpp:1077 src/actions/actions.cpp:1133
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1085
+#: src/actions/actions.cpp:1088
 #, c-format
 msgid "%d week"
 msgstr ""
 
-#: src/actions/actions.cpp:1085
+#: src/actions/actions.cpp:1088
 #, c-format
 msgid "%d weeks"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1099
 #, c-format
 msgid "%d day"
 msgstr ""
 
-#: src/actions/actions.cpp:1096
+#: src/actions/actions.cpp:1099
 #, c-format
 msgid "%d days"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1106
+#: src/actions/actions.cpp:1109
 #, c-format
 msgid "%d hour"
 msgstr ""
 
-#: src/actions/actions.cpp:1106
+#: src/actions/actions.cpp:1109
 #, c-format
 msgid "%d hours"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1116
+#: src/actions/actions.cpp:1119
 #, c-format
 msgid "%d minute"
 msgstr ""
 
-#: src/actions/actions.cpp:1116
+#: src/actions/actions.cpp:1119
 #, c-format
 msgid "%d minutes"
 msgstr ""
 
 #. TRANSLATORS: uptime command
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1129
 #, c-format
 msgid "%d second"
 msgstr ""
 
-#: src/actions/actions.cpp:1126
+#: src/actions/actions.cpp:1129
 #, c-format
 msgid "%d seconds"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1187 src/actions/actions.cpp:1196
+#: src/actions/actions.cpp:1190 src/actions/actions.cpp:1199
 msgid "Resource images:"
 msgstr ""
 
 #. TRANSLATORS: dump command
-#: src/actions/actions.cpp:1190 src/actions/actions.cpp:1199
+#: src/actions/actions.cpp:1193 src/actions/actions.cpp:1202
 msgid "Resource orphaned images:"
 msgstr ""
 
 #. TRANSLATORS: dump environment command
-#: src/actions/actions.cpp:1287
+#: src/actions/actions.cpp:1290
 msgid "Environment variables dumped"
 msgstr ""
 
-#: src/actions/actions.cpp:1406
+#: src/actions/actions.cpp:1409
 msgid "Uploaded config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1415
+#: src/actions/actions.cpp:1418
 msgid "Uploaded server config into:"
 msgstr ""
 
-#: src/actions/actions.cpp:1424
+#: src/actions/actions.cpp:1427
 msgid "Uploaded log into:"
 msgstr ""
 
@@ -323,25 +323,25 @@ msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:418
+#: src/being/being.cpp:426
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:590
+#: src/being/being.cpp:598
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:590
+#: src/being/being.cpp:598
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1973 src/gui/windows/whoisonline.cpp:865
+#: src/being/being.cpp:1981 src/gui/windows/whoisonline.cpp:868
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1978 src/gui/windows/whoisonline.cpp:870
+#: src/being/being.cpp:1986 src/gui/windows/whoisonline.cpp:873
 msgid "I"
 msgstr "I"
 
@@ -538,12 +538,12 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:932 src/client.cpp:1393 src/client.cpp:1407
+#: src/client.cpp:932 src/client.cpp:1394 src/client.cpp:1412
 #: src/gui/dialogsmanager.cpp:106 src/gui/popups/popupmenu.cpp:732
 #: src/gui/popups/popupmenu.cpp:970 src/gui/windows/didyouknowwindow.cpp:81
-#: src/gui/windows/inventorywindow.cpp:257
-#: src/gui/windows/inventorywindow.cpp:280
-#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:260
+#: src/gui/windows/inventorywindow.cpp:284
+#: src/gui/windows/maileditwindow.cpp:52 src/gui/windows/mailviewwindow.cpp:58
 #: src/gui/windows/npcdialog.cpp:75 src/gui/windows/npcdialog.cpp:113
 #: src/gui/windows/questswindow.cpp:77 src/gui/windows/shopwindow.cpp:111
 msgid "Close"
@@ -591,54 +591,54 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: info message
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: error message
-#: src/client.cpp:1391 src/client.cpp:1405 src/client.cpp:1600
+#: src/client.cpp:1391 src/client.cpp:1409 src/client.cpp:1616
 #: src/gui/windows/changeemaildialog.cpp:164
 #: src/gui/windows/changepassworddialog.cpp:154
 #: src/gui/windows/charcreatedialog.cpp:376
-#: src/gui/windows/charselectdialog.cpp:318
+#: src/gui/windows/charselectdialog.cpp:323
 #: src/gui/windows/editserverdialog.cpp:212
 #: src/gui/windows/registerdialog.cpp:243
 #: src/gui/windows/unregisterdialog.cpp:143
 #: src/net/ea/charserverhandler.cpp:141
 #: src/net/eathena/charserverhandler.cpp:577
 #: src/net/eathena/charserverhandler.cpp:579
-#: src/net/eathena/charserverhandler.cpp:652
+#: src/net/eathena/charserverhandler.cpp:661
 #: src/net/tmwa/charserverhandler.cpp:521
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1420
+#: src/client.cpp:1428
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1461
+#: src/client.cpp:1469
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1463
+#: src/client.cpp:1471
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1488
+#: src/client.cpp:1500
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1490
+#: src/client.cpp:1502
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1517
+#: src/client.cpp:1532
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1519
+#: src/client.cpp:1534
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
@@ -678,36 +678,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:256 src/gui/windows/chatwindow.cpp:2137
+#: src/game.cpp:255 src/gui/windows/chatwindow.cpp:2137
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:274 src/gui/windowmenu.cpp:158
+#: src/game.cpp:273 src/gui/windowmenu.cpp:158
 #: src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:571
+#: src/game.cpp:570
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:581
+#: src/game.cpp:580
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:668
+#: src/game.cpp:667
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:671
+#: src/game.cpp:670
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1067,7 +1067,7 @@ msgstr ""
 
 #. TRANSLATORS: away type in status bar
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:466
+#: src/gamemodifiers.cpp:411 src/gamemodifiers.cpp:470
 msgid "(?) away"
 msgstr ""
 
@@ -1077,41 +1077,41 @@ msgid "Away"
 msgstr "距离"
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:462
+#: src/gamemodifiers.cpp:466
 msgid "(G) game camera mode"
 msgstr ""
 
 #. TRANSLATORS: camera mode in status bar
-#: src/gamemodifiers.cpp:464
+#: src/gamemodifiers.cpp:468
 msgid "(F) free camera mode"
 msgstr ""
 
 #. TRANSLATORS: error message question
-#: src/gui/dialogsmanager.cpp:115
+#: src/gui/dialogsmanager.cpp:118
 msgid "Do you want to open support page?"
 msgstr ""
 
 #. TRANSLATORS: message header
-#: src/gui/dialogsmanager.cpp:127 src/gui/dialogsmanager.cpp:152
-#: src/gui/dialogsmanager.cpp:168
+#: src/gui/dialogsmanager.cpp:130 src/gui/dialogsmanager.cpp:158
+#: src/gui/dialogsmanager.cpp:177
 msgid "Message"
 msgstr "讯息"
 
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
-#: src/gui/dialogsmanager.cpp:130 src/gui/popups/popupmenu.cpp:2625
+#: src/gui/dialogsmanager.cpp:133 src/gui/popups/popupmenu.cpp:2625
 msgid "Revive"
 msgstr ""
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:154
+#: src/gui/dialogsmanager.cpp:160
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/gui/dialogsmanager.cpp:170
+#: src/gui/dialogsmanager.cpp:179
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
@@ -1579,7 +1579,6 @@ msgstr "建立"
 #. TRANSLATORS: connection dialog button
 #. TRANSLATORS: edit server dialog button
 #. TRANSLATORS: item amount window button
-#. TRANSLATORS: button in npc post dialog
 #. TRANSLATORS: quit dialog button
 #. TRANSLATORS: register dialog. button.
 #. TRANSLATORS: setup button
@@ -1607,8 +1606,7 @@ msgstr "建立"
 #: src/gui/windows/charcreatedialog.cpp:122
 #: src/gui/windows/connectiondialog.cpp:52
 #: src/gui/windows/editserverdialog.cpp:61
-#: src/gui/windows/itemamountwindow.cpp:176
-#: src/gui/windows/npcpostdialog.cpp:70 src/gui/windows/quitdialog.cpp:70
+#: src/gui/windows/itemamountwindow.cpp:176 src/gui/windows/quitdialog.cpp:70
 #: src/gui/windows/registerdialog.cpp:65 src/gui/windows/setupwindow.cpp:96
 #: src/gui/windows/textcommandeditor.cpp:86 src/gui/windows/textdialog.cpp:55
 #: src/gui/windows/unregisterdialog.cpp:54
@@ -1644,7 +1642,7 @@ msgstr "交易"
 #: src/gui/popups/popupmenu.cpp:159 src/gui/popups/popupmenu.cpp:281
 #: src/gui/popups/popupmenu.cpp:808 src/gui/widgets/skillinfo.cpp:116
 #: src/gui/windows/botcheckerwindow.cpp:88 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:401 src/net/tmwa/generalhandler.cpp:358
+#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:363
 msgid "Attack"
 msgstr "攻击"
 
@@ -1727,7 +1725,7 @@ msgstr "说话"
 #. TRANSLATORS: shop window tab name
 #. TRANSLATORS: input action name
 #: src/gui/popups/popupmenu.cpp:258 src/gui/popups/popupmenu.cpp:2369
-#: src/gui/windows/buydialog.cpp:194 src/gui/windows/buydialog.cpp:212
+#: src/gui/windows/buydialog.cpp:193 src/gui/windows/buydialog.cpp:211
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/buyselldialog.cpp:71
 #: src/gui/windows/shopwindow.cpp:168 src/input/pages/basic.cpp:240
 #: src/resources/db/npcdb.cpp:147
@@ -1822,7 +1820,7 @@ msgstr ""
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:351 src/gui/windows/equipmentwindow.cpp:74
-#: src/gui/windows/inventorywindow.cpp:189 src/resources/itemtypemapdata.h:45
+#: src/gui/windows/inventorywindow.cpp:192 src/resources/itemtypemapdata.h:45
 #: src/resources/itemtypemapdata.h:49 src/resources/itemtypemapdata.h:53
 #: src/resources/itemtypemapdata.h:57 src/resources/itemtypemapdata.h:61
 #: src/resources/itemtypemapdata.h:65 src/resources/itemtypemapdata.h:69
@@ -1838,7 +1836,7 @@ msgstr "卸下装备"
 #. TRANSLATORS: rename map item
 #. TRANSLATORS: shop window button
 #: src/gui/popups/popupmenu.cpp:355 src/gui/popups/popupmenu.cpp:614
-#: src/gui/windows/charselectdialog.cpp:132 src/gui/windows/shopwindow.cpp:192
+#: src/gui/windows/charselectdialog.cpp:134 src/gui/windows/shopwindow.cpp:192
 msgid "Rename"
 msgstr "重命名"
 
@@ -1916,7 +1914,7 @@ msgstr ""
 #. TRANSLATORS: outfits button tooltip
 #. TRANSLATORS: outfits window name
 #: src/gui/popups/popupmenu.cpp:674 src/gui/setupinputpages.cpp:53
-#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:220
+#: src/gui/windowmenu.cpp:142 src/gui/windows/inventorywindow.cpp:223
 #: src/gui/windows/outfitwindow.cpp:55
 msgid "Outfits"
 msgstr "套装"
@@ -2069,9 +2067,9 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: setup button
 #: src/gui/popups/popupmenu.cpp:1658 src/gui/popups/popupmenu.cpp:1808
-#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:252
-#: src/gui/windows/inventorywindow.cpp:275
-#: src/gui/windows/inventorywindow.cpp:876 src/gui/windows/setupwindow.cpp:98
+#: src/gui/popups/popupmenu.cpp:1849 src/gui/windows/inventorywindow.cpp:255
+#: src/gui/windows/inventorywindow.cpp:279
+#: src/gui/windows/inventorywindow.cpp:891 src/gui/windows/setupwindow.cpp:98
 msgid "Store"
 msgstr "存储"
 
@@ -2094,8 +2092,8 @@ msgstr "商店所有"
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: get item from storage
 #. TRANSLATORS: storage button
-#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:254
-#: src/gui/windows/inventorywindow.cpp:277
+#: src/gui/popups/popupmenu.cpp:1689 src/gui/windows/inventorywindow.cpp:257
+#: src/gui/windows/inventorywindow.cpp:281
 msgid "Retrieve"
 msgstr "取回"
 
@@ -2122,8 +2120,8 @@ msgstr "检索所有"
 #. TRANSLATORS: skills dialog button
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:1770 src/gui/popups/popupmenu.cpp:2568
-#: src/gui/windows/inventorywindow.cpp:187
-#: src/gui/windows/inventorywindow.cpp:759 src/gui/windows/skilldialog.cpp:79
+#: src/gui/windows/inventorywindow.cpp:190
+#: src/gui/windows/inventorywindow.cpp:766 src/gui/windows/skilldialog.cpp:79
 #: src/gui/windows/skilldialog.cpp:151 src/gui/windows/skilldialog.cpp:321
 #: src/gui/windows/skilldialog.cpp:485 src/gui/windows/skilldialog.cpp:567
 #: src/resources/itemtypemapdata.h:37 src/resources/itemtypemapdata.h:41
@@ -2216,7 +2214,7 @@ msgstr ""
 #. TRANSLATORS: add player to ignore list
 #. TRANSLATORS: confirm dialog button
 #: src/gui/popups/popupmenu.cpp:2246 src/gui/popups/popupmenu.cpp:2282
-#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:60
+#: src/gui/popups/popupmenu.cpp:2321 src/gui/windows/confirmdialog.cpp:61
 msgid "Ignore"
 msgstr "忽略"
 
@@ -2319,8 +2317,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: drop item
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:202
-#: src/gui/windows/inventorywindow.cpp:884
+#: src/gui/popups/popupmenu.cpp:2583 src/gui/windows/inventorywindow.cpp:205
+#: src/gui/windows/inventorywindow.cpp:899
 msgid "Drop..."
 msgstr "掉落..."
 
@@ -2335,7 +2333,7 @@ msgstr "所有"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: inventory button
 #: src/gui/popups/popupmenu.cpp:2592 src/gui/windowmenu.cpp:130
-#: src/gui/windows/inventorywindow.cpp:889
+#: src/gui/windows/inventorywindow.cpp:904
 msgid "Drop"
 msgstr "丢弃"
 
@@ -2676,7 +2674,7 @@ msgstr ""
 
 #. TRANSLATORS: status window label
 #: src/gui/widgets/characterdisplay.cpp:138
-#: src/gui/windows/inventorywindow.cpp:675 src/gui/windows/statuswindow.cpp:73
+#: src/gui/windows/inventorywindow.cpp:682 src/gui/windows/statuswindow.cpp:73
 #: src/gui/windows/statuswindow.cpp:233 src/gui/windows/statuswindow.cpp:345
 #, c-format
 msgid "Money: %s"
@@ -3837,7 +3835,7 @@ msgstr ""
 
 #. TRANSLATORS: unknown key name
 #. TRANSLATORS: quests window quest name
-#: src/gui/widgets/tabs/setup_input.cpp:330
+#: src/gui/widgets/tabs/setup_input.cpp:333
 #: src/gui/windows/questswindow.cpp:203
 msgid "unknown"
 msgstr ""
@@ -4172,7 +4170,7 @@ msgstr ""
 #. TRANSLATORS: shop button tooltip
 #: src/gui/widgets/tabs/setup_other.cpp:267 src/gui/windowmenu.cpp:138
 #: src/gui/windows/buyselldialog.cpp:40 src/gui/windows/buyselldialog.cpp:51
-#: src/gui/windows/inventorywindow.cpp:224
+#: src/gui/windows/inventorywindow.cpp:227
 msgid "Shop"
 msgstr "商店"
 
@@ -4188,9 +4186,7 @@ msgstr "启用商店模式"
 
 #. TRANSLATORS: settings group
 #. TRANSLATORS: npc dialog name
-#. TRANSLATORS: npc post dialog caption
 #: src/gui/widgets/tabs/setup_other.cpp:279 src/gui/windows/npcdialog.cpp:86
-#: src/gui/windows/npcpostdialog.cpp:43
 msgid "NPC"
 msgstr "NPC"
 
@@ -4343,7 +4339,7 @@ msgstr ""
 #. TRANSLATORS: texture compression type
 #. TRANSLATORS: confirm dialog button
 #: src/gui/widgets/tabs/setup_perfomance.cpp:42
-#: src/gui/windows/confirmdialog.cpp:57
+#: src/gui/windows/confirmdialog.cpp:58
 msgid "No"
 msgstr "否"
 
@@ -4577,7 +4573,7 @@ msgstr "允许密语"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:84 src/gui/windows/mailwindow.cpp:65
+#: src/gui/windows/charselectdialog.cpp:86 src/gui/windows/mailwindow.cpp:64
 #: src/gui/windows/serverdialog.cpp:122 src/gui/windows/shopwindow.cpp:123
 #: src/gui/windows/textcommandeditor.cpp:90 src/input/pages/gui.cpp:111
 msgid "Delete"
@@ -4674,14 +4670,15 @@ msgid "Theme info"
 msgstr ""
 
 #. TRANSLATORS: theme message dialog
-#: src/gui/widgets/tabs/setup_theme.cpp:340
+#: src/gui/widgets/tabs/setup_theme.cpp:343
 msgid "Theme Changed"
 msgstr "主题更改"
 
+#. TRANSLATORS: ok dialog message
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_theme.cpp:340
-#: src/gui/widgets/tabs/setup_video.cpp:385
-#: src/gui/widgets/tabs/setup_video.cpp:398
+#: src/gui/widgets/tabs/setup_theme.cpp:345
+#: src/gui/widgets/tabs/setup_video.cpp:391
+#: src/gui/widgets/tabs/setup_video.cpp:407
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效."
 
@@ -4774,8 +4771,8 @@ msgstr "FPS限制:"
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:80
 #: src/gui/widgets/tabs/setup_video.cpp:122
-#: src/gui/widgets/tabs/setup_video.cpp:315
-#: src/gui/widgets/tabs/setup_video.cpp:451
+#: src/gui/widgets/tabs/setup_video.cpp:321
+#: src/gui/widgets/tabs/setup_video.cpp:463
 msgid "Alt FPS limit: "
 msgstr ""
 
@@ -4807,9 +4804,9 @@ msgstr ""
 #. TRANSLATORS: video settings label
 #: src/gui/widgets/tabs/setup_video.cpp:119
 #: src/gui/widgets/tabs/setup_video.cpp:123
-#: src/gui/widgets/tabs/setup_video.cpp:313
-#: src/gui/widgets/tabs/setup_video.cpp:435
-#: src/gui/widgets/tabs/setup_video.cpp:448
+#: src/gui/widgets/tabs/setup_video.cpp:319
+#: src/gui/widgets/tabs/setup_video.cpp:447
+#: src/gui/widgets/tabs/setup_video.cpp:460
 msgid "None"
 msgstr "w"
 
@@ -4836,32 +4833,32 @@ msgid "Restart needed for changes to take effect."
 msgstr "重启生效."
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:270
+#: src/gui/widgets/tabs/setup_video.cpp:273
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:272
+#: src/gui/widgets/tabs/setup_video.cpp:275
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始."
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:354
+#: src/gui/widgets/tabs/setup_video.cpp:360
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
 #. TRANSLATORS: resolution question dialog
-#: src/gui/widgets/tabs/setup_video.cpp:356
+#: src/gui/widgets/tabs/setup_video.cpp:362
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:                 "
 
 #. TRANSLATORS: video settings warning
-#: src/gui/widgets/tabs/setup_video.cpp:383
-#: src/gui/widgets/tabs/setup_video.cpp:396
+#: src/gui/widgets/tabs/setup_video.cpp:389
+#: src/gui/widgets/tabs/setup_video.cpp:405
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/widgets/tabs/setup_video.cpp:386
+#: src/gui/widgets/tabs/setup_video.cpp:392
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -5153,7 +5150,7 @@ msgid "Ignore items"
 msgstr ""
 
 #. TRANSLATORS: social window label
-#: src/gui/widgets/tabs/socialplayerstab.h:194
+#: src/gui/widgets/tabs/socialplayerstab.h:196
 #, c-format
 msgid "Visible players: %d"
 msgstr ""
@@ -5227,7 +5224,7 @@ msgstr ""
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: equipment button tooltip
 #: src/gui/windowmenu.cpp:97 src/gui/windows/equipmentwindow.cpp:67
-#: src/gui/windows/inventorywindow.cpp:226
+#: src/gui/windows/inventorywindow.cpp:229
 msgid "Equipment"
 msgstr "装备"
 
@@ -5238,7 +5235,7 @@ msgstr ""
 
 #. TRANSLATORS: inventory window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:143
+#: src/gui/windowmenu.cpp:100 src/gui/windows/inventorywindow.cpp:146
 #: src/inventory.cpp:301
 msgid "Inventory"
 msgstr "物品栏"
@@ -5250,8 +5247,8 @@ msgstr ""
 
 #. TRANSLATORS: cart button tooltip
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:222
-#: src/inventory.cpp:311
+#: src/gui/windowmenu.cpp:103 src/gui/windows/inventorywindow.cpp:225
+#: src/inventory.cpp:317
 msgid "Cart"
 msgstr ""
 
@@ -5346,7 +5343,7 @@ msgstr "A"
 #. TRANSLATORS: full button name
 #. TRANSLATORS: mail window name
 #. TRANSLATORS: inventory type name
-#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:52
+#: src/gui/windowmenu.cpp:154 src/gui/windows/mailwindow.cpp:51
 #: src/inventory.cpp:322
 msgid "Mail"
 msgstr ""
@@ -5406,7 +5403,7 @@ msgid "Result"
 msgstr "结果"
 
 #. TRANSLATORS: buy dialog name
-#: src/gui/windows/buydialog.cpp:176
+#: src/gui/windows/buydialog.cpp:175
 msgid "Create items"
 msgstr ""
 
@@ -5419,7 +5416,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:275 src/gui/windows/charcreatedialog.cpp:120
-#: src/gui/windows/charselectdialog.cpp:623
+#: src/gui/windows/charselectdialog.cpp:631
 #: src/gui/windows/socialwindow.cpp:79
 msgid "Create"
 msgstr "建立"
@@ -5567,7 +5564,7 @@ msgstr ""
 
 #. TRANSLATORS: char create dialog label
 #: src/gui/windows/charcreatedialog.cpp:118
-#: src/gui/windows/charcreatedialog.cpp:496
+#: src/gui/windows/charcreatedialog.cpp:499
 #, c-format
 msgid "Please distribute %d points"
 msgstr "请分发%d点数"
@@ -5605,12 +5602,12 @@ msgid "Your name needs to be at least 4 characters."
 msgstr "你的名字需要至少4个字符."
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:486
+#: src/gui/windows/charcreatedialog.cpp:489
 msgid "Character stats OK"
 msgstr "角色状态可以"
 
 #. TRANSLATORS: char create dialog label
-#: src/gui/windows/charcreatedialog.cpp:502
+#: src/gui/windows/charcreatedialog.cpp:505
 #, c-format
 msgid "Please remove %d points"
 msgstr "请删除%d点数"
@@ -5632,62 +5629,62 @@ msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:73
+#: src/gui/windows/charselectdialog.cpp:75
 msgid "Switch"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:75
+#: src/gui/windows/charselectdialog.cpp:77
 msgid "Password"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:80
-#: src/gui/windows/charselectdialog.cpp:613
+#: src/gui/windows/charselectdialog.cpp:82
+#: src/gui/windows/charselectdialog.cpp:621
 #: src/gui/windows/updaterwindow.cpp:192
 msgid "Play"
 msgstr "开始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/net/ea/charserverhandler.cpp:160
-#: src/net/eathena/charserverhandler.cpp:592
-#: src/net/eathena/charserverhandler.cpp:622
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/net/ea/charserverhandler.cpp:163
+#: src/net/eathena/charserverhandler.cpp:595
+#: src/net/eathena/charserverhandler.cpp:628
 msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:110
+#: src/gui/windows/charselectdialog.cpp:112
 #: src/gui/windows/unregisterdialog.cpp:47
 #: src/gui/windows/unregisterdialog.cpp:52
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:122
+#: src/gui/windows/charselectdialog.cpp:124
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:166
+#: src/gui/windows/charselectdialog.cpp:168
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:194
+#: src/gui/windows/charselectdialog.cpp:196
 msgid "Please set new pincode"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:241
+#: src/gui/windows/charselectdialog.cpp:243
 msgid "Please enter new name"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:260
+#: src/gui/windows/charselectdialog.cpp:262
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5697,25 +5694,25 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:318
+#: src/gui/windows/charselectdialog.cpp:323
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:463
+#: src/gui/windows/charselectdialog.cpp:471
 msgid "Enter your email for deleting character"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:463
+#: src/gui/windows/charselectdialog.cpp:471
 msgid "Enter email:"
 msgstr ""
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:470
+#: src/gui/windows/charselectdialog.cpp:478
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:470
+#: src/gui/windows/charselectdialog.cpp:478
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -5738,7 +5735,7 @@ msgid "%s's pet"
 msgstr ""
 
 #. TRANSLATORS: confirm dialog button
-#: src/gui/windows/confirmdialog.cpp:55
+#: src/gui/windows/confirmdialog.cpp:56
 msgid "Yes"
 msgstr "是"
 
@@ -5849,7 +5846,7 @@ msgstr ""
 #. TRANSLATORS: inventory button
 #. TRANSLATORS: outfits window button
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:185 src/gui/windows/outfitwindow.cpp:62
+#: src/gui/windows/inventorywindow.cpp:188 src/gui/windows/outfitwindow.cpp:62
 #: src/resources/itemtypemapdata.h:45 src/resources/itemtypemapdata.h:49
 #: src/resources/itemtypemapdata.h:53 src/resources/itemtypemapdata.h:57
 #: src/resources/itemtypemapdata.h:61 src/resources/itemtypemapdata.h:65
@@ -5861,27 +5858,27 @@ msgid "Equip"
 msgstr "装备"
 
 #. TRANSLATORS: inventory button
-#: src/gui/windows/inventorywindow.cpp:204
+#: src/gui/windows/inventorywindow.cpp:207
 msgid "Split"
 msgstr "分离"
 
 #. TRANSLATORS: inventory outfits button
-#: src/gui/windows/inventorywindow.cpp:206
+#: src/gui/windows/inventorywindow.cpp:209
 msgid "O"
 msgstr ""
 
 #. TRANSLATORS: inventory cart button
-#: src/gui/windows/inventorywindow.cpp:208
+#: src/gui/windows/inventorywindow.cpp:211
 msgid "C"
 msgstr ""
 
 #. TRANSLATORS: inventory shop button
-#: src/gui/windows/inventorywindow.cpp:210
+#: src/gui/windows/inventorywindow.cpp:213
 msgid "S"
 msgstr ""
 
 #. TRANSLATORS: inventory equipment button
-#: src/gui/windows/inventorywindow.cpp:212
+#: src/gui/windows/inventorywindow.cpp:215
 msgid "E"
 msgstr ""
 
@@ -6084,14 +6081,13 @@ msgid "Open register url"
 msgstr ""
 
 #. TRANSLATORS: mail edit window name
-#: src/gui/windows/maileditwindow.cpp:53
+#: src/gui/windows/maileditwindow.cpp:47
 #, fuzzy
 msgid "Edit mail"
 msgstr "电子邮件:"
 
 #. TRANSLATORS: mail edit window button
-#. TRANSLATORS: button in npc post dialog
-#: src/gui/windows/maileditwindow.cpp:56 src/gui/windows/npcpostdialog.cpp:66
+#: src/gui/windows/maileditwindow.cpp:50
 msgid "Send"
 msgstr "发送"
 
@@ -6100,90 +6096,89 @@ msgstr "发送"
 #. TRANSLATORS: servers dialog button
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: trade window button
-#: src/gui/windows/maileditwindow.cpp:60 src/gui/windows/npcdialog.cpp:115
+#: src/gui/windows/maileditwindow.cpp:54 src/gui/windows/npcdialog.cpp:115
 #: src/gui/windows/serverdialog.cpp:118 src/gui/windows/shopwindow.cpp:121
 #: src/gui/windows/tradewindow.cpp:84
 msgid "Add"
 msgstr "添加"
 
 #. TRANSLATORS: mail edit window label
-#. TRANSLATORS: label in npc post dialog
-#: src/gui/windows/maileditwindow.cpp:62 src/gui/windows/npcpostdialog.cpp:59
+#: src/gui/windows/maileditwindow.cpp:56
 msgid "To:"
 msgstr "至:"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:75
+#: src/gui/windows/maileditwindow.cpp:58 src/gui/windows/mailviewwindow.cpp:71
 msgid "Subject:"
 msgstr ""
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:66
-#: src/gui/windows/mailviewwindow.cpp:106
+#: src/gui/windows/maileditwindow.cpp:60
+#: src/gui/windows/mailviewwindow.cpp:102
 #, fuzzy
 msgid "Money:"
 msgstr "金币: %s"
 
 #. TRANSLATORS: mail edit window label
-#: src/gui/windows/maileditwindow.cpp:68
-#: src/gui/windows/mailviewwindow.cpp:122
-#: src/gui/windows/mailviewwindow.cpp:127
+#: src/gui/windows/maileditwindow.cpp:62
+#: src/gui/windows/mailviewwindow.cpp:118
+#: src/gui/windows/mailviewwindow.cpp:123
 #, fuzzy
 msgid "Item:"
 msgstr "地图项"
 
 #. TRANSLATORS: mail edit window label
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/maileditwindow.cpp:70 src/gui/windows/mailviewwindow.cpp:78
+#: src/gui/windows/maileditwindow.cpp:64 src/gui/windows/mailviewwindow.cpp:74
 #, fuzzy
 msgid "Message:"
 msgstr "讯息"
 
 #. TRANSLATORS: mail view window name
-#: src/gui/windows/mailviewwindow.cpp:56
+#: src/gui/windows/mailviewwindow.cpp:52
 msgid "View mail"
 msgstr ""
 
 #. TRANSLATORS: mail view window button
-#: src/gui/windows/mailviewwindow.cpp:66
+#: src/gui/windows/mailviewwindow.cpp:62
 msgid "Reply"
 msgstr ""
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:68
+#: src/gui/windows/mailviewwindow.cpp:64
 #, fuzzy
 msgid "Time:"
 msgstr "时间"
 
 #. TRANSLATORS: mail view window label
-#: src/gui/windows/mailviewwindow.cpp:72
+#: src/gui/windows/mailviewwindow.cpp:68
 msgid "From:"
 msgstr ""
 
-#: src/gui/windows/mailviewwindow.cpp:134
+#: src/gui/windows/mailviewwindow.cpp:130
 #, fuzzy
 msgid "Get attach"
 msgstr "(?) 攻击"
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:61
+#: src/gui/windows/mailwindow.cpp:60
 msgid "Refresh"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:63
+#: src/gui/windows/mailwindow.cpp:62
 msgid "New"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:67
+#: src/gui/windows/mailwindow.cpp:66
 msgid "Return"
 msgstr ""
 
 #. TRANSLATORS: mail window button
-#: src/gui/windows/mailwindow.cpp:69
+#: src/gui/windows/mailwindow.cpp:68
 msgid "Open"
 msgstr ""
 
@@ -6274,11 +6269,6 @@ msgstr "下一个"
 msgid "Submit"
 msgstr "提交"
 
-#. TRANSLATORS: npc post message error
-#: src/gui/windows/npcpostdialog.cpp:113
-msgid "Failed to send as sender or letter invalid."
-msgstr "发送信件失败或者信件无效."
-
 #. TRANSLATORS: sell confirmation header
 #: src/gui/windows/npcselldialog.cpp:67
 msgid "sell item"
@@ -6411,12 +6401,12 @@ msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误!"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:505
+#: src/gui/windows/serverdialog.cpp:507
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
 #. TRANSLATORS: servers dialog label
-#: src/gui/windows/serverdialog.cpp:510
+#: src/gui/windows/serverdialog.cpp:512
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -6432,7 +6422,7 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/shopwindow.cpp:1071
+#: src/gui/windows/shopwindow.cpp:101 src/gui/windows/shopwindow.cpp:1076
 msgid "Personal Shop"
 msgstr "个人商店"
 
@@ -6462,17 +6452,17 @@ msgstr ""
 
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:955 src/net/ea/tradehandler.cpp:172
+#: src/gui/windows/shopwindow.cpp:957 src/net/ea/tradehandler.cpp:172
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:955
+#: src/gui/windows/shopwindow.cpp:958
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗?"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:1076
+#: src/gui/windows/shopwindow.cpp:1081
 #, c-format
 msgid "Personal Shop - %s"
 msgstr ""
@@ -6615,12 +6605,12 @@ msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:514
+#: src/gui/windows/socialwindow.cpp:517
 msgid "Party Name"
 msgstr ""
 
 #. TRANSLATORS: party creation message
-#: src/gui/windows/socialwindow.cpp:516
+#: src/gui/windows/socialwindow.cpp:519
 msgid "Choose your party's name."
 msgstr "选择n的名称."
 
@@ -6819,27 +6809,27 @@ msgid "Completed"
 msgstr "已完成"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:639
+#: src/gui/windows/whoisonline.cpp:93 src/gui/windows/whoisonline.cpp:642
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
 #. TRANSLATORS: who is online. button.
-#: src/gui/windows/whoisonline.cpp:104
+#: src/gui/windows/whoisonline.cpp:107
 msgid "Update"
 msgstr "更新"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:230
+#: src/gui/windows/whoisonline.cpp:233
 msgid "Who Is Online - "
 msgstr "谁在线 - "
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:655
+#: src/gui/windows/whoisonline.cpp:658
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
 #. TRANSLATORS: who is online window name
-#: src/gui/windows/whoisonline.cpp:699
+#: src/gui/windows/whoisonline.cpp:702
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -6861,25 +6851,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:374 src/input/inputmanager.cpp:418
+#: src/input/inputmanager.cpp:373 src/input/inputmanager.cpp:417
 #: src/input/keyboardconfig.cpp:102
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:380
+#: src/input/inputmanager.cpp:379
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:394
+#: src/input/inputmanager.cpp:393
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:424
+#: src/input/inputmanager.cpp:423
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6887,7 +6877,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:438 src/input/keyboardconfig.cpp:146
+#: src/input/inputmanager.cpp:437 src/input/keyboardconfig.cpp:146
 msgid "u key"
 msgstr ""
 
@@ -8024,7 +8014,7 @@ msgid "Storage"
 msgstr "仓库"
 
 #. TRANSLATORS: inventory type name
-#: src/inventory.cpp:316
+#: src/inventory.cpp:311
 msgid "Npc"
 msgstr ""
 
@@ -8209,7 +8199,7 @@ msgstr ""
 msgid "Incorrect look."
 msgstr ""
 
-#: src/net/ea/charserverhandler.cpp:160
+#: src/net/ea/charserverhandler.cpp:163
 msgid "Character deleted."
 msgstr "角色已删除."
 
@@ -8377,30 +8367,30 @@ msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: char rename error
 #: src/net/eathena/charserverhandler.cpp:577
-#: src/net/eathena/charserverhandler.cpp:614
+#: src/net/eathena/charserverhandler.cpp:620
 msgid "Character rename error."
 msgstr ""
 
-#: src/net/eathena/charserverhandler.cpp:592
+#: src/net/eathena/charserverhandler.cpp:595
 msgid "Character renamed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:605
+#: src/net/eathena/charserverhandler.cpp:611
 msgid "Rename not allowed."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:609
+#: src/net/eathena/charserverhandler.cpp:615
 msgid "New name is not set."
 msgstr ""
 
 #. TRANSLATORS: char rename error
-#: src/net/eathena/charserverhandler.cpp:618
+#: src/net/eathena/charserverhandler.cpp:624
 msgid "Character not found."
 msgstr ""
 
-#: src/net/eathena/charserverhandler.cpp:652
+#: src/net/eathena/charserverhandler.cpp:661
 #: src/net/tmwa/charserverhandler.cpp:521
 msgid "Failed to delete character."
 msgstr "删除角色失败."
@@ -8601,93 +8591,88 @@ msgstr ""
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:393 src/net/tmwa/generalhandler.cpp:345
+#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:346
 msgid "Strength"
 msgstr "力量"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:394 src/net/tmwa/generalhandler.cpp:347
+#: src/net/eathena/generalhandler.cpp:396 src/net/tmwa/generalhandler.cpp:349
 msgid "Agility"
 msgstr "敏捷"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:395 src/net/tmwa/generalhandler.cpp:349
+#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:352
 msgid "Vitality"
 msgstr "生命"
 
-#: src/net/eathena/generalhandler.cpp:397 src/net/tmwa/generalhandler.cpp:352
+#: src/net/eathena/generalhandler.cpp:400 src/net/tmwa/generalhandler.cpp:355
 msgid "Intelligence"
 msgstr "智慧"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:398 src/net/tmwa/generalhandler.cpp:354
+#: src/net/eathena/generalhandler.cpp:402 src/net/tmwa/generalhandler.cpp:358
 msgid "Dexterity"
 msgstr "敏捷"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:399 src/net/tmwa/generalhandler.cpp:356
+#: src/net/eathena/generalhandler.cpp:404 src/net/tmwa/generalhandler.cpp:361
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:402 src/net/tmwa/generalhandler.cpp:360
+#: src/net/eathena/generalhandler.cpp:407 src/net/tmwa/generalhandler.cpp:365
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:403 src/net/tmwa/generalhandler.cpp:362
+#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:367
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:404 src/net/tmwa/generalhandler.cpp:364
+#: src/net/eathena/generalhandler.cpp:409 src/net/tmwa/generalhandler.cpp:369
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:406 src/net/tmwa/generalhandler.cpp:367
+#: src/net/eathena/generalhandler.cpp:411 src/net/tmwa/generalhandler.cpp:372
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:408 src/net/tmwa/generalhandler.cpp:370
+#: src/net/eathena/generalhandler.cpp:413 src/net/tmwa/generalhandler.cpp:375
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:410 src/net/tmwa/generalhandler.cpp:373
+#: src/net/eathena/generalhandler.cpp:415 src/net/tmwa/generalhandler.cpp:378
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:411 src/net/tmwa/generalhandler.cpp:375
+#: src/net/eathena/generalhandler.cpp:416 src/net/tmwa/generalhandler.cpp:380
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:412 src/net/tmwa/generalhandler.cpp:377
+#: src/net/eathena/generalhandler.cpp:417 src/net/tmwa/generalhandler.cpp:382
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:413 src/net/tmwa/generalhandler.cpp:379
+#: src/net/eathena/generalhandler.cpp:418 src/net/tmwa/generalhandler.cpp:384
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:414 src/net/tmwa/generalhandler.cpp:381
+#: src/net/eathena/generalhandler.cpp:419 src/net/tmwa/generalhandler.cpp:386
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
-#: src/net/eathena/generalhandler.cpp:415
+#: src/net/eathena/generalhandler.cpp:420
 msgid "Karma"
 msgstr ""
 
-#: src/net/eathena/generalhandler.cpp:416
+#: src/net/eathena/generalhandler.cpp:421
 msgid "Manner"
 msgstr ""
 
@@ -8706,7 +8691,7 @@ msgstr "旧密码不正确."
 msgid "New password too short."
 msgstr "新密码太短."
 
-#: src/net/eathena/mailhandler.cpp:217
+#: src/net/eathena/mailhandler.cpp:216
 #, c-format
 msgid "You have new mail from %s with subject %s"
 msgstr ""
@@ -9719,3 +9704,6 @@ msgstr "/%s的选项是\"yes\"，\"no\"，\"true\"，\"false\"，\"1\"，\"0\"."
 
 #~ msgid "%s %d?"
 #~ msgstr "%s %d?"
+
+#~ msgid "Failed to send as sender or letter invalid."
+#~ msgstr "发送信件失败或者信件无效."