update translations.

1 files changed, 548 insertions, 348 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 5f490c48a..df9349a5f 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2014-09-27 13:23+0300\n"
-"PO-Revision-Date: 2014-09-24 10:01+0000\n"
+"POT-Creation-Date: 2014-10-08 01:19+0300\n"
+"PO-Revision-Date: 2014-09-28 10:01+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -40,7 +40,7 @@ msgstr ""
 #. TRANSLATORS: ok dialog button
 #. TRANSLATORS: text dialog button
 #. TRANSLATORS: ok dialog button
-#: src/actions/actions.cpp:131 src/client.cpp:1463 src/client.cpp:1490
+#: src/actions/actions.cpp:131 src/client.cpp:1461 src/client.cpp:1488
 #: src/gamemodifiers.cpp:423 src/gui/widgets/tabs/setup_input.cpp:163
 #: src/gui/widgets/tabs/setup_theme.cpp:312
 #: src/gui/widgets/tabs/setup_theme.cpp:343
@@ -51,8 +51,8 @@ msgstr ""
 #: src/gui/windows/changeemaildialog.cpp:170
 #: src/gui/windows/changepassworddialog.cpp:160
 #: src/gui/windows/charcreatedialog.cpp:373
-#: src/gui/windows/charselectdialog.cpp:255
-#: src/gui/windows/charselectdialog.cpp:291 src/gui/windows/editdialog.cpp:49
+#: src/gui/windows/charselectdialog.cpp:277
+#: src/gui/windows/charselectdialog.cpp:313 src/gui/windows/editdialog.cpp:49
 #: src/gui/windows/editserverdialog.cpp:61
 #: src/gui/windows/editserverdialog.cpp:208
 #: src/gui/windows/itemamountwindow.cpp:158 src/gui/windows/quitdialog.cpp:70
@@ -60,7 +60,9 @@ msgstr ""
 #: src/gui/windows/textdialog.cpp:48 src/gui/windows/unregisterdialog.cpp:149
 #: src/net/ea/charserverhandler.cpp:143 src/net/ea/charserverhandler.cpp:162
 #: src/net/ea/charserverhandler.cpp:175 src/net/ea/gamehandler.cpp:79
-#: src/net/ea/playerhandler.cpp:263 src/net/ea/playerhandler.cpp:279
+#: src/net/ea/playerhandler.cpp:424 src/net/ea/playerhandler.cpp:440
+#: src/net/eathena/charserverhandler.cpp:533
+#: src/net/eathena/charserverhandler.cpp:563
 msgid "OK"
 msgstr "确定"
 
@@ -184,7 +186,7 @@ msgstr "公会名称缺失."
 
 #. TRANSLATORS: party invite message
 #. TRANSLATORS: change relation
-#: src/actions/chat.cpp:303 src/actions/commands.cpp:65
+#: src/actions/chat.cpp:303 src/actions/commands.cpp:64
 msgid "Please specify a name."
 msgstr "请指定一个名称."
 
@@ -207,75 +209,75 @@ msgid "Message now closes chat."
 msgstr "讯息现在关闭聊天."
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:108
+#: src/actions/commands.cpp:107
 #, c-format
 msgid "Player already %s!"
 msgstr "玩家已经%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:120
+#: src/actions/commands.cpp:119
 #, c-format
 msgid "Player successfully %s!"
 msgstr "玩家成功%s!"
 
 #. TRANSLATORS: change relation
-#: src/actions/commands.cpp:122
+#: src/actions/commands.cpp:121
 #, c-format
 msgid "Player could not be %s!"
 msgstr "玩家不能为 %s!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:153
+#: src/actions/commands.cpp:152
 msgid "Player wasn't ignored!"
 msgstr "玩家没有被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:162
+#: src/actions/commands.cpp:161
 msgid "Player no longer ignored!"
 msgstr "玩家不再被忽视!"
 
 #. TRANSLATORS: unignore command
-#: src/actions/commands.cpp:164
+#: src/actions/commands.cpp:163
 msgid "Player could not be unignored!"
 msgstr "不能取消对玩家的忽视!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:179
+#: src/actions/commands.cpp:178
 msgid "Player already erased!"
 msgstr "玩家已经被删除!"
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:192
+#: src/actions/commands.cpp:191
 msgid "Player no longer erased!"
 msgstr ""
 
 #. TRANSLATORS: erase command
-#: src/actions/commands.cpp:194
+#: src/actions/commands.cpp:193
 msgid "Player could not be erased!"
 msgstr "无法删除玩家!"
 
 #. TRANSLATORS: adding friend command
-#: src/actions/commands.cpp:201
+#: src/actions/commands.cpp:200
 msgid "friend"
 msgstr "朋友"
 
 #. TRANSLATORS: disregard command
-#: src/actions/commands.cpp:208
+#: src/actions/commands.cpp:207
 msgid "disregarded"
 msgstr "无视"
 
 #. TRANSLATORS: neutral command
-#: src/actions/commands.cpp:215
+#: src/actions/commands.cpp:214
 msgid "neutral"
 msgstr "中立"
 
 #. TRANSLATORS: blacklist command
-#: src/actions/commands.cpp:222
+#: src/actions/commands.cpp:221
 msgid "blacklisted"
 msgstr ""
 
 #. TRANSLATORS: enemy command
-#: src/actions/commands.cpp:229
+#: src/actions/commands.cpp:228
 msgid "enemy"
 msgstr ""
 
@@ -290,77 +292,77 @@ msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
 #. TRANSLATORS: visible beings on map
-#: src/actormanager.cpp:1306
+#: src/actormanager.cpp:1310
 msgid "Visible on map"
 msgstr "在地图上可见"
 
 #. TRANSLATORS: default race name
-#: src/being/being.cpp:389
+#: src/being/being.cpp:393
 msgid "Human"
 msgstr ""
 
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being/being.cpp:556
+#: src/being/being.cpp:560
 msgid "miss"
 msgstr "失误"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being/being.cpp:1865 src/gui/windows/whoisonline.cpp:855
+#: src/being/being.cpp:1869 src/gui/windows/whoisonline.cpp:855
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being/being.cpp:1870 src/gui/windows/whoisonline.cpp:860
+#: src/being/being.cpp:1874 src/gui/windows/whoisonline.cpp:860
 msgid "I"
 msgstr "I"
 
 #. TRANSLATORS: chat message after death
-#: src/being/localplayer.cpp:379
+#: src/being/localplayer.cpp:380
 #, c-format
 msgid "You were killed by %s"
 msgstr "你被 %s 杀掉了"
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:824
+#: src/being/localplayer.cpp:825
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:828
+#: src/being/localplayer.cpp:829
 msgid "Item is too heavy."
 msgstr "项目是太重了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:832
+#: src/being/localplayer.cpp:833
 msgid "Item is too far away."
 msgstr "物品太远了."
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:836
+#: src/being/localplayer.cpp:837
 msgid "Inventory is full."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:840
+#: src/being/localplayer.cpp:841
 msgid "Stack is too big."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:844
+#: src/being/localplayer.cpp:845
 msgid "Item belongs to someone else."
 msgstr ""
 
 #. TRANSLATORS: pickup error message
-#: src/being/localplayer.cpp:848
+#: src/being/localplayer.cpp:849
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/being/localplayer.cpp:872
+#: src/being/localplayer.cpp:873
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
@@ -368,43 +370,43 @@ msgstr[0] "你拾起%d[@@%d|%s @@]."
 
 #. TRANSLATORS: this is normal experience
 #. TRANSLATORS: get xp message
-#: src/being/localplayer.cpp:1054 src/being/localplayer.cpp:1055
-#: src/being/localplayer.cpp:1091
+#: src/being/localplayer.cpp:1055 src/being/localplayer.cpp:1056
+#: src/being/localplayer.cpp:1092
 msgid "xp"
 msgstr ""
 
 #. TRANSLATORS: this is job experience
-#: src/being/localplayer.cpp:1059 src/being/localplayer.cpp:1065
-#: src/being/localplayer.cpp:1071
+#: src/being/localplayer.cpp:1060 src/being/localplayer.cpp:1066
+#: src/being/localplayer.cpp:1072
 msgid "job"
 msgstr ""
 
 #. TRANSLATORS: follow command message
-#: src/being/localplayer.cpp:2794
+#: src/being/localplayer.cpp:2795
 #, c-format
 msgid "Follow: %s"
 msgstr ""
 
 #. TRANSLATORS: follow command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2800 src/being/localplayer.cpp:2825
+#: src/being/localplayer.cpp:2801 src/being/localplayer.cpp:2826
 msgid "Follow canceled"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
-#: src/being/localplayer.cpp:2810
+#: src/being/localplayer.cpp:2811
 #, c-format
 msgid "Imitation: %s"
 msgstr ""
 
 #. TRANSLATORS: imitate command message
 #. TRANSLATORS: cancel follow message
-#: src/being/localplayer.cpp:2816 src/being/localplayer.cpp:2830
+#: src/being/localplayer.cpp:2817 src/being/localplayer.cpp:2831
 msgid "Imitation canceled"
 msgstr ""
 
 #. TRANSLATORS: wait player/monster message
-#: src/being/localplayer.cpp:3180
+#: src/being/localplayer.cpp:3181
 #, c-format
 msgid "You see %s"
 msgstr ""
@@ -442,37 +444,37 @@ msgstr "流动的泡沫"
 #. TRANSLATORS: setup tab quick button
 #. TRANSLATORS: full button name
 #. TRANSLATORS: setup window name
-#: src/client.cpp:920 src/gui/windowmenu.cpp:162
+#: src/client.cpp:918 src/gui/windowmenu.cpp:162
 #: src/gui/windows/setupwindow.cpp:62
 msgid "Setup"
 msgstr "设置"
 
 #. TRANSLATORS: perfoamance tab quick button
 #. TRANSLATORS: settings tab name
-#: src/client.cpp:923 src/gui/widgets/tabs/setup_perfomance.cpp:54
+#: src/client.cpp:921 src/gui/widgets/tabs/setup_perfomance.cpp:54
 msgid "Performance"
 msgstr ""
 
 #. TRANSLATORS: video tab quick button
 #. TRANSLATORS: video settings tab name
-#: src/client.cpp:926 src/gui/widgets/tabs/setup_video.cpp:105
+#: src/client.cpp:924 src/gui/widgets/tabs/setup_video.cpp:105
 msgid "Video"
 msgstr "视频"
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: theme settings tab name
-#: src/client.cpp:929 src/gui/widgets/tabs/setup_theme.cpp:122
+#: src/client.cpp:927 src/gui/widgets/tabs/setup_theme.cpp:122
 msgid "Theme"
 msgstr "主题"
 
 #. TRANSLATORS: theme tab quick button
-#: src/client.cpp:932
+#: src/client.cpp:930
 msgid "About"
 msgstr ""
 
 #. TRANSLATORS: theme tab quick button
 #. TRANSLATORS: help window name
-#: src/client.cpp:935 src/gui/windowmenu.cpp:74
+#: src/client.cpp:933 src/gui/windowmenu.cpp:74
 #: src/gui/windows/helpwindow.cpp:53
 msgid "Help"
 msgstr "帮助"
@@ -488,42 +490,42 @@ msgstr "帮助"
 #. TRANSLATORS: npc dialog button
 #. TRANSLATORS: quests window button
 #. TRANSLATORS: shop window button
-#: src/client.cpp:939 src/client.cpp:1391 src/client.cpp:1405
+#: src/client.cpp:937 src/client.cpp:1389 src/client.cpp:1403
 #: src/gui/dialogsmanager.cpp:84 src/gui/popups/popupmenu.cpp:691
 #: src/gui/popups/popupmenu.cpp:923 src/gui/windows/didyouknowwindow.cpp:81
 #: src/gui/windows/inventorywindow.cpp:226 src/gui/windows/npcdialog.cpp:74
 #: src/gui/windows/npcdialog.cpp:112 src/gui/windows/questswindow.cpp:77
-#: src/gui/windows/shopwindow.cpp:84
+#: src/gui/windows/shopwindow.cpp:83
 msgid "Close"
 msgstr "关闭"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1065
+#: src/client.cpp:1063
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1113
+#: src/client.cpp:1111
 msgid "Logging in"
 msgstr "登录中"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1156
+#: src/client.cpp:1154
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1282
+#: src/client.cpp:1280
 msgid "Requesting characters"
 msgstr "请求角色"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1322
+#: src/client.cpp:1320
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1334
+#: src/client.cpp:1332
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
@@ -537,72 +539,76 @@ msgstr "正在更改游戏服务器"
 #. TRANSLATORS: unregister dialog. error message.
 #. TRANSLATORS: error message header
 #. TRANSLATORS: error message
-#: src/client.cpp:1389 src/client.cpp:1403 src/client.cpp:1598
+#. TRANSLATORS: info message
+#. TRANSLATORS: ok dialog button
+#: src/client.cpp:1387 src/client.cpp:1401 src/client.cpp:1596
 #: src/gui/windows/changeemaildialog.cpp:167
 #: src/gui/windows/changepassworddialog.cpp:157
 #: src/gui/windows/charcreatedialog.cpp:369
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
 #: src/gui/windows/editserverdialog.cpp:203
 #: src/gui/windows/registerdialog.cpp:245
 #: src/gui/windows/unregisterdialog.cpp:146
 #: src/net/ea/charserverhandler.cpp:141 src/net/ea/charserverhandler.cpp:173
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:518
 msgid "Error"
 msgstr "错误"
 
 #. TRANSLATORS: connection dialog header
-#: src/client.cpp:1418
+#: src/client.cpp:1416
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
 #. TRANSLATORS: password change message header
-#: src/client.cpp:1459
+#: src/client.cpp:1457
 msgid "Password Change"
 msgstr "更改密码"
 
 #. TRANSLATORS: password change message text
-#: src/client.cpp:1461
+#: src/client.cpp:1459
 msgid "Password changed successfully!"
 msgstr "密码更改成功!"
 
 #. TRANSLATORS: email change message header
-#: src/client.cpp:1486
+#: src/client.cpp:1484
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
 #. TRANSLATORS: email change message text
-#: src/client.cpp:1488
+#: src/client.cpp:1486
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功!"
 
 #. TRANSLATORS: unregister message header
-#: src/client.cpp:1515
+#: src/client.cpp:1513
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
 #. TRANSLATORS: unregister message text
-#: src/client.cpp:1517
+#: src/client.cpp:1515
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来..."
 
 #. TRANSLATORS: directory creation error
 #: src/configmanager.cpp:53 src/dirs.cpp:260 src/dirs.cpp:275 src/dirs.cpp:320
-#: src/dirs.cpp:481 src/dirs.cpp:489
+#: src/dirs.cpp:488 src/dirs.cpp:496
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出."
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:363
+#: src/dirs.cpp:370
 #, c-format
 msgid "Invalid update host: %s."
 msgstr ""
 
 #. TRANSLATORS: update server initialisation error
-#: src/dirs.cpp:404 src/dirs.cpp:411
+#: src/dirs.cpp:411 src/dirs.cpp:418
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误!"
 
-#: src/dirs.cpp:433 src/dirs.cpp:451
+#: src/dirs.cpp:440 src/dirs.cpp:458
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出."
@@ -620,36 +626,36 @@ msgid "dyecmd srcdyestring dstfile"
 msgstr ""
 
 #. TRANSLATORS: chat tab header
-#: src/game.cpp:236 src/gui/widgets/tabs/chattab.cpp:482
+#: src/game.cpp:234 src/gui/widgets/tabs/chattab.cpp:482
 msgid "General"
 msgstr "常规"
 
 #. TRANSLATORS: chat tab header
 #. TRANSLATORS: full button name
 #. TRANSLATORS: debug window name
-#: src/game.cpp:253 src/gui/widgets/tabs/chattab.cpp:484
+#: src/game.cpp:251 src/gui/widgets/tabs/chattab.cpp:484
 #: src/gui/windowmenu.cpp:149 src/gui/windows/debugwindow.cpp:42
 msgid "Debug"
 msgstr "调试"
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:541
+#: src/game.cpp:532
 #, c-format
 msgid "Screenshot saved as %s"
 msgstr ""
 
 #. TRANSLATORS: save file message
-#: src/game.cpp:551
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败!"
 
 #. TRANSLATORS: error message text
-#: src/game.cpp:634
+#: src/game.cpp:625
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失."
 
 #. TRANSLATORS: error message header
-#: src/game.cpp:637
+#: src/game.cpp:628
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -1040,6 +1046,7 @@ msgstr ""
 #: src/gui/models/colorlistmodel.h:33 src/gui/models/sortlistmodelinv.h:34
 #: src/gui/widgets/tabs/setup_other.cpp:79
 #: src/gui/widgets/tabs/setup_visual.cpp:81
+#: src/gui/windows/equipmentwindow.cpp:577
 msgid "default"
 msgstr "默认"
 
@@ -1530,7 +1537,7 @@ msgstr "交易"
 #: src/gui/popups/popupmenu.cpp:167 src/gui/popups/popupmenu.cpp:273
 #: src/gui/popups/popupmenu.cpp:767 src/gui/widgets/skillinfo.cpp:113
 #: src/gui/windows/botcheckerwindow.cpp:89 src/input/pages/basic.cpp:42
-#: src/net/eathena/generalhandler.cpp:289 src/net/tmwa/generalhandler.cpp:321
+#: src/net/eathena/generalhandler.cpp:356 src/net/tmwa/generalhandler.cpp:320
 msgid "Attack"
 msgstr "攻击"
 
@@ -1666,9 +1673,8 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: Mercenary move to master
 #: src/gui/popups/popupmenu.cpp:309 src/gui/popups/popupmenu.cpp:320
-#, fuzzy
 msgid "Move to master"
-msgstr "移动到目标"
+msgstr ""
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: fire mercenary
@@ -1700,7 +1706,7 @@ msgstr ""
 #. TRANSLATORS: pet unequip item
 #. TRANSLATORS: equipment window button
 #. TRANSLATORS: inventory button
-#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:70
+#: src/gui/popups/popupmenu.cpp:340 src/gui/windows/equipmentwindow.cpp:72
 #: src/gui/windows/inventorywindow.cpp:175 src/resources/itemtypemapdata.h:47
 #: src/resources/itemtypemapdata.h:51 src/resources/itemtypemapdata.h:55
 #: src/resources/itemtypemapdata.h:59 src/resources/itemtypemapdata.h:63
@@ -1758,7 +1764,7 @@ msgstr "地图项"
 
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: rename map item
-#: src/gui/popups/popupmenu.cpp:574
+#: src/gui/popups/popupmenu.cpp:574 src/gui/windows/charselectdialog.cpp:132
 msgid "Rename"
 msgstr "重命名"
 
@@ -2270,7 +2276,7 @@ msgstr ""
 #. TRANSLATORS: popup menu item
 #. TRANSLATORS: revive player
 #. TRANSLATORS: ok dialog button
-#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:364
+#: src/gui/popups/popupmenu.cpp:3000 src/net/ea/playerhandler.cpp:195
 msgid "Revive"
 msgstr ""
 
@@ -2294,7 +2300,7 @@ msgstr "快捷键"
 #. TRANSLATORS: input tab sub tab name
 #. TRANSLATORS: settings group
 #. TRANSLATORS: full button name
-#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:319
+#: src/gui/setupinputpages.cpp:49 src/gui/widgets/tabs/setup_other.cpp:315
 #: src/gui/windowmenu.cpp:158
 msgid "Windows"
 msgstr ""
@@ -2322,7 +2328,7 @@ msgstr "聊天"
 #. TRANSLATORS: input action name
 #: src/gui/setupinputpages.cpp:57 src/gui/widgets/tabs/setup_audio.cpp:151
 #: src/gui/widgets/tabs/setup_chat.cpp:179
-#: src/gui/widgets/tabs/setup_other.cpp:341
+#: src/gui/widgets/tabs/setup_other.cpp:337
 #: src/gui/widgets/tabs/setup_visual.cpp:192
 #: src/gui/windows/charcreatedialog.cpp:119
 #: src/gui/windows/registerdialog.cpp:106 src/input/pages/gui.cpp:87
@@ -2335,212 +2341,227 @@ msgid "Gui"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:113
+#: src/gui/userpalette.cpp:116
 msgid "Being"
 msgstr "存在"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:115
+#: src/gui/userpalette.cpp:118
 msgid "Friend names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:117
+#: src/gui/userpalette.cpp:120
 msgid "Disregarded names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:119
+#: src/gui/userpalette.cpp:122
 msgid "Ignored names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:121
+#: src/gui/userpalette.cpp:124
 msgid "Erased names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:123
+#: src/gui/userpalette.cpp:126
 msgid "Other players names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:125
+#: src/gui/userpalette.cpp:128
 msgid "Own name"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:127
+#: src/gui/userpalette.cpp:130
 msgid "GM names"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:129
+#: src/gui/userpalette.cpp:132
 msgid "NPCs"
 msgstr "NPCs"
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:131 src/gui/widgets/tabs/setup_other.cpp:108
+#: src/gui/userpalette.cpp:134 src/gui/widgets/tabs/setup_other.cpp:108
 msgid "Monsters"
 msgstr "怪物"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:133
+#: src/gui/userpalette.cpp:136
 msgid "Monster HP bar"
 msgstr "怪物的HPl"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:136
+#: src/gui/userpalette.cpp:139
 msgid "Monster HP bar (second color)"
 msgstr "怪物的HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:138
+#: src/gui/userpalette.cpp:141
 msgid "Party members"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:140
+#: src/gui/userpalette.cpp:143
 msgid "Guild members"
 msgstr ""
 
 #. TRANSLATORS: palette color
 #. TRANSLATORS: settings option
-#: src/gui/userpalette.cpp:142 src/gui/widgets/tabs/setup_visual.cpp:157
+#: src/gui/userpalette.cpp:145 src/gui/widgets/tabs/setup_visual.cpp:157
 msgid "Particle effects"
 msgstr "粒子效果"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:144
+#: src/gui/userpalette.cpp:147
 msgid "Pickup notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:146
+#: src/gui/userpalette.cpp:149
 msgid "Exp notification"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:148
+#: src/gui/userpalette.cpp:151
 msgid "Player HP bar"
 msgstr "玩家惠普酒吧"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:152
+#: src/gui/userpalette.cpp:155
 msgid "Player HP bar (second color)"
 msgstr "玩家HP指示栏(第二个颜色)"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:154
+#: src/gui/userpalette.cpp:157
 msgid "Player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:156
+#: src/gui/userpalette.cpp:159
 msgid "Monster hits player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:160
+#: src/gui/userpalette.cpp:163
 msgid "Other player hits local player"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:162
+#: src/gui/userpalette.cpp:165
 msgid "Critical Hit"
 msgstr "会心一击"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:166
+#: src/gui/userpalette.cpp:169
 msgid "Local player hits monster"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:169
+#: src/gui/userpalette.cpp:172
 msgid "Local player critical hit"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:172
+#: src/gui/userpalette.cpp:175
 msgid "Local player miss"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:174
+#: src/gui/userpalette.cpp:177
 msgid "Misses"
 msgstr "失误"
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:176
+#: src/gui/userpalette.cpp:179
 msgid "Portal highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:179
+#: src/gui/userpalette.cpp:182
 msgid "Default collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:182
+#: src/gui/userpalette.cpp:185
 msgid "Air collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:185
+#: src/gui/userpalette.cpp:188
 msgid "Water collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:188
+#: src/gui/userpalette.cpp:191
 msgid "Special ground collision highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:191
+#: src/gui/userpalette.cpp:194
 msgid "Walkable highlight"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:194
+#: src/gui/userpalette.cpp:197
 msgid "Local player attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:197
+#: src/gui/userpalette.cpp:200
 msgid "Local player attack range border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:200
+#: src/gui/userpalette.cpp:203
 msgid "Monster attack range"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:204
+#: src/gui/userpalette.cpp:207
 msgid "Floor item amount color"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:207
+#: src/gui/userpalette.cpp:210
 msgid "Home place"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:210
+#: src/gui/userpalette.cpp:213
 msgid "Home place border"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:213
+#: src/gui/userpalette.cpp:216
 msgid "Road point"
 msgstr ""
 
 #. TRANSLATORS: palette color
-#: src/gui/userpalette.cpp:216
+#: src/gui/userpalette.cpp:219
 msgid "Tiles border"
 msgstr ""
 
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:221
+msgid "Pets"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:223
+msgid "Mercenary"
+msgstr ""
+
+#. TRANSLATORS: palette color
+#: src/gui/userpalette.cpp:225
+msgid "Homunculus"
+msgstr ""
+
 #: src/gui/widgets/characterdisplay.cpp:135
 #, c-format
 msgid "Level: %u"
@@ -2643,7 +2664,8 @@ msgid "Type: %s"
 msgstr ""
 
 #. TRANSLATORS: Skill type
-#: src/gui/widgets/skillinfo.cpp:108
+#. TRANSLATORS: unknown equipment page name
+#: src/gui/widgets/skillinfo.cpp:108 src/gui/windows/equipmentwindow.cpp:584
 msgid "Unknown"
 msgstr ""
 
@@ -2844,22 +2866,22 @@ msgstr "粒子数：%d个"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:262
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:313
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
 msgid "Target:"
 msgstr "目标:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:264
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:319
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:377
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:325
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
 msgid "Target Id:"
 msgstr "目标ID:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:267
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:322
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:379
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:328
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
 msgid "Target type:"
 msgstr ""
 
@@ -2870,7 +2892,7 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:271
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:338
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:344
 msgid "Target race:"
 msgstr ""
 
@@ -2886,67 +2908,81 @@ msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:277
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:363
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:369
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:387
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:375
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:399
 msgid "Attack delay:"
 msgstr "攻击延迟:"
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:279
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:350
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:389
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:401
 msgid "Minimal hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:281
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:353
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:391
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:359
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:403
 msgid "Maximum hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:283
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:356
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:362
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:405
 msgid "Critical hit:"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:327
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:285
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:365
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:407
+msgid "Karma:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:287
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:368
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:409
+msgid "Manner:"
+msgstr ""
+
+#. TRANSLATORS: debug window label
 #: src/gui/widgets/tabs/debugwindowtabs.cpp:333
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:381
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:339
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:393
 msgid "Target Level:"
 msgstr "目标水平:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:341
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:383
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:347
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:395
 msgid "Target Party:"
 msgstr "目标:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:345
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:385
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:351
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:397
 msgid "Target Guild:"
 msgstr "目标公会:"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:430
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:436
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:451
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:457
 #, c-format
 msgid "Ping: %s ms"
 msgstr ""
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:439
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:460
 #, c-format
 msgid "In: %d bytes/s"
 msgstr "输入:%d 字节/"
 
 #. TRANSLATORS: debug window label
-#: src/gui/widgets/tabs/debugwindowtabs.cpp:442
+#: src/gui/widgets/tabs/debugwindowtabs.cpp:463
 #, c-format
 msgid "Out: %d bytes/s"
 msgstr ""
@@ -3775,137 +3811,132 @@ msgstr "挂机支持"
 
 #. TRANSLATORS: settings option
 #: src/gui/widgets/tabs/setup_other.cpp:294
-msgid "Enable auction bot support"
-msgstr ""
-
-#. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:298
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:304
+#: src/gui/widgets/tabs/setup_other.cpp:300
 msgid "Keyboard"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:307
+#: src/gui/widgets/tabs/setup_other.cpp:303
 msgid "Repeat delay"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:311
+#: src/gui/widgets/tabs/setup_other.cpp:307
 msgid "Repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:315
+#: src/gui/widgets/tabs/setup_other.cpp:311
 msgid "Custom repeat interval"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:323
+#: src/gui/widgets/tabs/setup_other.cpp:319
 msgid "Shortcut buttons"
 msgstr ""
 
 #. TRANSLATORS: settings group
-#: src/gui/widgets/tabs/setup_other.cpp:328
+#: src/gui/widgets/tabs/setup_other.cpp:324
 msgid "Proxy server"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:332
+#: src/gui/widgets/tabs/setup_other.cpp:328
 msgid "Proxy type"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:336
+#: src/gui/widgets/tabs/setup_other.cpp:332
 msgid "Proxy address:port"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:344
+#: src/gui/widgets/tabs/setup_other.cpp:340
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:348
+#: src/gui/widgets/tabs/setup_other.cpp:344
 msgid "Hide support page link on error"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:352
+#: src/gui/widgets/tabs/setup_other.cpp:348
 msgid "Enable double clicks"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:356
+#: src/gui/widgets/tabs/setup_other.cpp:352
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:360
+#: src/gui/widgets/tabs/setup_other.cpp:356
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:365
+#: src/gui/widgets/tabs/setup_other.cpp:361
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:369
+#: src/gui/widgets/tabs/setup_other.cpp:365
 msgid "Ignore logging packets"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:373
+#: src/gui/widgets/tabs/setup_other.cpp:369
 msgid "Enable OpenGL log"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:377
+#: src/gui/widgets/tabs/setup_other.cpp:373
 msgid "Enable input log"
 msgstr ""
 
 #. TRANSLATORS: settings option
 #. TRANSLATORS: input action name
-#: src/gui/widgets/tabs/setup_other.cpp:381 src/input/pages/other.cpp:362
+#: src/gui/widgets/tabs/setup_other.cpp:377 src/input/pages/other.cpp:362
 msgid "Upload log file"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:385
+#: src/gui/widgets/tabs/setup_other.cpp:381
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:389
+#: src/gui/widgets/tabs/setup_other.cpp:385
 msgid "Hide shield sprite"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:394
+#: src/gui/widgets/tabs/setup_other.cpp:390
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:400
+#: src/gui/widgets/tabs/setup_other.cpp:396
 msgid "Screenshot directory"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:405
+#: src/gui/widgets/tabs/setup_other.cpp:401
 msgid "Network delay between sub servers"
 msgstr ""
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:409
+#: src/gui/widgets/tabs/setup_other.cpp:405
 msgid "Show background"
 msgstr "显示背景"
 
 #. TRANSLATORS: settings option
-#: src/gui/widgets/tabs/setup_other.cpp:414
+#: src/gui/widgets/tabs/setup_other.cpp:410
 msgid "Screen density override"
 msgstr ""
 
@@ -4136,9 +4167,9 @@ msgstr "允许密语"
 #. TRANSLATORS: command editor button
 #. TRANSLATORS: input action name
 #: src/gui/widgets/tabs/setup_relations.cpp:77
-#: src/gui/windows/charselectdialog.cpp:82
-#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:101
-#: src/gui/windows/shopwindow.cpp:108 src/gui/windows/textcommandeditor.cpp:92
+#: src/gui/windows/charselectdialog.cpp:84
+#: src/gui/windows/serverdialog.cpp:125 src/gui/windows/shopwindow.cpp:100
+#: src/gui/windows/shopwindow.cpp:107 src/gui/windows/textcommandeditor.cpp:92
 #: src/input/pages/gui.cpp:111
 msgid "Delete"
 msgstr "删除"
@@ -4792,7 +4823,7 @@ msgstr ""
 
 #. TRANSLATORS: equipment window name
 #. TRANSLATORS: inventory button
-#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:63
+#: src/gui/windowmenu.cpp:99 src/gui/windows/equipmentwindow.cpp:65
 #: src/gui/windows/inventorywindow.cpp:196
 msgid "Equipment"
 msgstr "装备"
@@ -4933,7 +4964,7 @@ msgstr ""
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: social window button
 #: src/gui/windows/buydialog.cpp:260 src/gui/windows/charcreatedialog.cpp:127
-#: src/gui/windows/charselectdialog.cpp:578
+#: src/gui/windows/charselectdialog.cpp:605
 #: src/gui/windows/socialwindow.cpp:86
 msgid "Create"
 msgstr "建立"
@@ -4977,10 +5008,8 @@ msgstr "电子邮件地址不匹配."
 
 #. TRANSLATORS: change password window name
 #. TRANSLATORS: change password dialog button
-#. TRANSLATORS: char select dialog. button.
 #: src/gui/windows/changepassworddialog.cpp:51
 #: src/gui/windows/changepassworddialog.cpp:57
-#: src/gui/windows/charselectdialog.cpp:73
 msgid "Change Password"
 msgstr "更换密码"
 
@@ -5134,57 +5163,71 @@ msgid "Are you sure you want to delete this character?"
 msgstr "你确定想删除这个角色?"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:64
+#: src/gui/windows/charselectdialog.cpp:66
 #, c-format
 msgid "Account %s (last login time %s)"
 msgstr ""
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:71
-msgid "Switch Login"
+#: src/gui/windows/charselectdialog.cpp:73
+#, fuzzy
+msgid "Switch"
 msgstr "登录"
 
 #. TRANSLATORS: char select dialog. button.
+#: src/gui/windows/charselectdialog.cpp:75
+#, fuzzy
+msgid "Password"
+msgstr "密码:"
+
+#. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: updater window button
-#: src/gui/windows/charselectdialog.cpp:78
-#: src/gui/windows/charselectdialog.cpp:573
+#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:595
 #: src/gui/windows/updaterwindow.cpp:195
 msgid "Play"
 msgstr "开始"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: info message
-#: src/gui/windows/charselectdialog.cpp:80
+#: src/gui/windows/charselectdialog.cpp:82
 #: src/net/ea/charserverhandler.cpp:160
+#: src/net/eathena/charserverhandler.cpp:531
+#: src/net/eathena/charserverhandler.cpp:561
 msgid "Info"
 msgstr "信息"
 
 #. TRANSLATORS: char select dialog. button.
 #. TRANSLATORS: unregister dialog name
 #. TRANSLATORS: unregister dialog. button.
-#: src/gui/windows/charselectdialog.cpp:106
+#: src/gui/windows/charselectdialog.cpp:110
 #: src/gui/windows/unregisterdialog.cpp:50
 #: src/gui/windows/unregisterdialog.cpp:55
 msgid "Unregister"
 msgstr "注销"
 
 #. TRANSLATORS: char select dialog. button.
-#: src/gui/windows/charselectdialog.cpp:118
+#: src/gui/windows/charselectdialog.cpp:122
 msgid "Change Email"
 msgstr "变更电子邮件"
 
 #. TRANSLATORS: char select dialog name
-#: src/gui/windows/charselectdialog.cpp:156
+#: src/gui/windows/charselectdialog.cpp:166
 #, c-format
 msgid "Account %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:184
+#: src/gui/windows/charselectdialog.cpp:194
 msgid "Please set new pincode"
 msgstr ""
 
+#: src/gui/windows/charselectdialog.cpp:240
+#, fuzzy
+msgid "Please enter new name"
+msgstr "请指定一个名称."
+
 #. TRANSLATORS: char select dialog. player info message.
-#: src/gui/windows/charselectdialog.cpp:237
+#: src/gui/windows/charselectdialog.cpp:259
 #, c-format
 msgid ""
 "Hp: %u/%u\n"
@@ -5194,16 +5237,16 @@ msgid ""
 "Money: %s"
 msgstr ""
 
-#: src/gui/windows/charselectdialog.cpp:289
+#: src/gui/windows/charselectdialog.cpp:311
 msgid "Incorrect password"
 msgstr "不正确的密码"
 
 #. TRANSLATORS: char deletion question.
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter password for deleting character"
 msgstr "删除字符输入的密码"
 
-#: src/gui/windows/charselectdialog.cpp:429
+#: src/gui/windows/charselectdialog.cpp:451
 msgid "Enter password:"
 msgstr "输入密码:"
 
@@ -5609,7 +5652,7 @@ msgstr "等级：%d"
 
 #. TRANSLATORS: status bar label
 #: src/gui/windows/ministatuswindow.cpp:364
-#: src/gui/windows/ministatuswindow.cpp:402
+#: src/gui/windows/ministatuswindow.cpp:401
 msgid "Need"
 msgstr "需要"
 
@@ -5640,7 +5683,7 @@ msgstr "提交"
 #. TRANSLATORS: shop window button
 #. TRANSLATORS: trade window button
 #: src/gui/windows/npcdialog.cpp:114 src/gui/windows/serverdialog.cpp:121
-#: src/gui/windows/shopwindow.cpp:99 src/gui/windows/shopwindow.cpp:106
+#: src/gui/windows/shopwindow.cpp:98 src/gui/windows/shopwindow.cpp:105
 #: src/gui/windows/tradewindow.cpp:83
 msgid "Add"
 msgstr "添加"
@@ -5803,43 +5846,38 @@ msgid "Reset Windows"
 msgstr "重置窗口"
 
 #. TRANSLATORS: shop window name
-#: src/gui/windows/shopwindow.cpp:80
+#: src/gui/windows/shopwindow.cpp:79
 msgid "Personal Shop"
 msgstr "个人商店"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:95
+#: src/gui/windows/shopwindow.cpp:94
 msgid "Buy items"
 msgstr "购买物品"
 
 #. TRANSLATORS: shop window label
-#: src/gui/windows/shopwindow.cpp:97
+#: src/gui/windows/shopwindow.cpp:96
 msgid "Sell items"
 msgstr "出售物品"
 
 #. TRANSLATORS: shop window label
 #. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:103 src/gui/windows/shopwindow.cpp:110
+#: src/gui/windows/shopwindow.cpp:102 src/gui/windows/shopwindow.cpp:109
 msgid "Announce"
 msgstr "公布"
 
 #. TRANSLATORS: shop window checkbox
-#: src/gui/windows/shopwindow.cpp:114
+#: src/gui/windows/shopwindow.cpp:113
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
-#. TRANSLATORS: shop window button
-#: src/gui/windows/shopwindow.cpp:176 src/gui/windows/shopwindow.cpp:179
-msgid "Auction"
-msgstr ""
-
 #. TRANSLATORS: shop window dialog
 #. TRANSLATORS: trade message
-#: src/gui/windows/shopwindow.cpp:791 src/net/ea/tradehandler.cpp:233
+#: src/gui/windows/shopwindow.cpp:776 src/net/ea/tradehandler.cpp:233
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/windows/shopwindow.cpp:791
+#: src/gui/windows/shopwindow.cpp:776
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗?"
@@ -6166,27 +6204,27 @@ msgstr "更新..."
 msgid "Connecting..."
 msgstr "连接中..."
 
-#: src/gui/windows/updaterwindow.cpp:398
+#: src/gui/windows/updaterwindow.cpp:407
 msgid "Show all news (can be slow)"
 msgstr ""
 
 #. TRANSLATORS: update message
-#: src/gui/windows/updaterwindow.cpp:824
+#: src/gui/windows/updaterwindow.cpp:833
 msgid "##1  The update process is incomplete."
 msgstr "##1 更新过程不完整."
 
 #. TRANSLATORS: Continues "The update process is incomplete.".
-#: src/gui/windows/updaterwindow.cpp:826
+#: src/gui/windows/updaterwindow.cpp:835
 msgid "##1  It is strongly recommended that"
 msgstr "##1 强烈建议"
 
 #. TRANSLATORS: Begins "It is strongly recommended that".
-#: src/gui/windows/updaterwindow.cpp:828
+#: src/gui/windows/updaterwindow.cpp:837
 msgid "##1  you try again later."
 msgstr ""
 
 #. TRANSLATORS: updater window label
-#: src/gui/windows/updaterwindow.cpp:1005
+#: src/gui/windows/updaterwindow.cpp:1021
 msgid "Completed"
 msgstr "已完成"
 
@@ -6233,25 +6271,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:370 src/input/inputmanager.cpp:414
+#: src/input/inputmanager.cpp:371 src/input/inputmanager.cpp:415
 #: src/input/keyboardconfig.cpp:104
 #, c-format
 msgid "key_%d"
 msgstr ""
 
 #. TRANSLATORS: long joystick button name. must be short.
-#: src/input/inputmanager.cpp:376
+#: src/input/inputmanager.cpp:377
 #, c-format
 msgid "JButton%d"
 msgstr ""
 
 #. TRANSLATORS: unknown long key type
-#: src/input/inputmanager.cpp:390
+#: src/input/inputmanager.cpp:391
 msgid "unknown key"
 msgstr ""
 
 #. TRANSLATORS: short joystick button name. muse be very short
-#: src/input/inputmanager.cpp:420
+#: src/input/inputmanager.cpp:421
 #, c-format
 msgid "JB%d"
 msgstr ""
@@ -6259,7 +6297,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:434 src/input/keyboardconfig.cpp:148
+#: src/input/inputmanager.cpp:435 src/input/keyboardconfig.cpp:148
 msgid "u key"
 msgstr ""
 
@@ -7430,74 +7468,74 @@ msgid "Request to quit denied!"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:188
+#: src/net/ea/guildhandler.cpp:135
 #, c-format
 msgid "Guild name: %s"
 msgstr ""
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:191
+#: src/net/ea/guildhandler.cpp:138
 #, c-format
 msgid "Guild master: %s"
 msgstr "工会会长: %s"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:194
+#: src/net/ea/guildhandler.cpp:141
 #, c-format
 msgid "Guild level: %d"
 msgstr "工会等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:197
+#: src/net/ea/guildhandler.cpp:144
 #, c-format
 msgid "Online members: %d"
 msgstr "在线玩家: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:200
+#: src/net/ea/guildhandler.cpp:147
 #, c-format
 msgid "Max members: %d"
 msgstr "最大成员: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:203
+#: src/net/ea/guildhandler.cpp:150
 #, c-format
 msgid "Average level: %d"
 msgstr "平均等级: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:206
+#: src/net/ea/guildhandler.cpp:153
 #, c-format
 msgid "Guild exp: %d"
 msgstr "工会经验值: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:209
+#: src/net/ea/guildhandler.cpp:156
 #, c-format
 msgid "Guild next exp: %d"
 msgstr "工会下一级所需经验: %d"
 
 #. TRANSLATORS: guild info message
-#: src/net/ea/guildhandler.cpp:212
+#: src/net/ea/guildhandler.cpp:159
 #, c-format
 msgid "Guild castle: %s"
 msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:179
+#: src/net/ea/gui/partytab.cpp:106 src/resources/notifications.h:191
 msgid "Item sharing enabled."
 msgstr "物品共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:183
+#: src/net/ea/gui/partytab.cpp:111 src/resources/notifications.h:195
 msgid "Item sharing disabled."
 msgstr "物品共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:187
+#: src/net/ea/gui/partytab.cpp:116 src/resources/notifications.h:199
 msgid "Item sharing not possible."
 msgstr "物品共享不可能."
 
@@ -7508,19 +7546,19 @@ msgstr ""
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:167
+#: src/net/ea/gui/partytab.cpp:156 src/resources/notifications.h:179
 msgid "Experience sharing enabled."
 msgstr "经验共享开启."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:171
+#: src/net/ea/gui/partytab.cpp:161 src/resources/notifications.h:183
 msgid "Experience sharing disabled."
 msgstr "经验共享关闭."
 
 #. TRANSLATORS: chat message
 #. TRANSLATORS: notification message
-#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:175
+#: src/net/ea/gui/partytab.cpp:166 src/resources/notifications.h:187
 msgid "Experience sharing not possible."
 msgstr "经验共享不可能."
 
@@ -7627,238 +7665,360 @@ msgid "Connection to server terminated. "
 msgstr "连接到服务器终止. "
 
 #. TRANSLATORS: message header
-#: src/net/ea/playerhandler.cpp:257 src/net/ea/playerhandler.cpp:273
-#: src/net/ea/playerhandler.cpp:361
+#: src/net/ea/playerhandler.cpp:192 src/net/ea/playerhandler.cpp:418
+#: src/net/ea/playerhandler.cpp:434
 msgid "Message"
 msgstr "讯息"
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:259
+#: src/net/ea/playerhandler.cpp:420
 msgid ""
 "You are carrying more than half your weight. You are unable to regain health."
 msgstr "你已携带超过半数负重。无法回复健康（体力）."
 
 #. TRANSLATORS: weight message
-#: src/net/ea/playerhandler.cpp:275
+#: src/net/ea/playerhandler.cpp:436
 msgid "You are carrying less than half your weight. You can regain health."
 msgstr ""
 
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:516
+#: src/net/eathena/charserverhandler.cpp:553
+#, fuzzy
+msgid "Character rename error."
+msgstr "角色已删除."
+
+#: src/net/eathena/charserverhandler.cpp:531
+#, fuzzy
+msgid "Character renamed."
+msgstr "角色已删除."
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:544
+msgid "Rename not allowed."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:548
+msgid "New name is not set."
+msgstr ""
+
+#. TRANSLATORS: char rename error
+#: src/net/eathena/charserverhandler.cpp:557
+#, fuzzy
+msgid "Character not found."
+msgstr "角色可用点: %d"
+
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:125
+#: src/net/eathena/generalhandler.cpp:123 src/net/tmwa/generalhandler.cpp:124
 #, c-format
 msgid "Strength %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:127
+#: src/net/eathena/generalhandler.cpp:124 src/net/tmwa/generalhandler.cpp:126
 #, c-format
 msgid "Agility %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:129
+#: src/net/eathena/generalhandler.cpp:125 src/net/tmwa/generalhandler.cpp:128
 #, c-format
 msgid "Vitality %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:131
+#: src/net/eathena/generalhandler.cpp:126 src/net/tmwa/generalhandler.cpp:130
 #, c-format
 msgid "Intelligence %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:133
+#: src/net/eathena/generalhandler.cpp:127 src/net/tmwa/generalhandler.cpp:132
 #, c-format
 msgid "Dexterity %s"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:129 src/net/tmwa/generalhandler.cpp:135
+#: src/net/eathena/generalhandler.cpp:128 src/net/tmwa/generalhandler.cpp:134
 #, c-format
 msgid "Luck %s"
 msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:152 src/net/tmwa/generalhandler.cpp:161
+#: src/net/eathena/generalhandler.cpp:159 src/net/tmwa/generalhandler.cpp:160
 msgid "Authentication failed."
 msgstr "身份验证失败."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:155 src/net/tmwa/generalhandler.cpp:165
+#: src/net/eathena/generalhandler.cpp:162 src/net/tmwa/generalhandler.cpp:164
 msgid "No servers available."
 msgstr "没有可用的服务器."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:160 src/net/tmwa/generalhandler.cpp:171
+#: src/net/eathena/generalhandler.cpp:167 src/net/tmwa/generalhandler.cpp:170
 msgid "Someone else is trying to use this account."
 msgstr "别人尝试使用该帐户."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:165 src/net/tmwa/generalhandler.cpp:177
+#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:176
 msgid "This account is already logged in."
 msgstr "此帐户已登录."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:169 src/net/tmwa/generalhandler.cpp:182
+#: src/net/eathena/generalhandler.cpp:176 src/net/tmwa/generalhandler.cpp:181
 msgid "Speed hack detected."
 msgstr "检测速度劈."
 
+#: src/net/eathena/generalhandler.cpp:179
+#, fuzzy
+msgid "Server full."
+msgstr "服务器:"
+
+#: src/net/eathena/generalhandler.cpp:182
+msgid "Sorry, you are underaged."
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:172 src/net/tmwa/generalhandler.cpp:186
+#: src/net/eathena/generalhandler.cpp:185 src/net/tmwa/generalhandler.cpp:185
 msgid "Duplicated login."
 msgstr "重复登录."
 
+#: src/net/eathena/generalhandler.cpp:188
+msgid "To many connections from same ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:191
+msgid "Not paid for this time."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:194
+msgid "Pay suspended."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:197
+msgid "Pay changed."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:200
+msgid "Pay wrong ip."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:203
+msgid "Pay game room."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:206
+msgid "Disconnect forced by GM."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:210
+msgid "Ban japan refuse."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:213
+msgid "Remained other account."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:216
+msgid "Ip unfair."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:219
+msgid "Ip count all."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:222
+msgid "Ip count."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:226
+msgid "Memory."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:229
+msgid "Han valid."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:232
+msgid "Ip limited access."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:235
+#, fuzzy
+msgid "Over characters list."
+msgstr "角色已删除."
+
+#: src/net/eathena/generalhandler.cpp:238
+msgid "Ip blocked."
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:241
+#, fuzzy
+msgid "Invalid password count."
+msgstr "旧密码不正确."
+
+#: src/net/eathena/generalhandler.cpp:244
+msgid "Not allowed race."
+msgstr ""
+
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:175 src/net/tmwa/generalhandler.cpp:190
+#: src/net/eathena/generalhandler.cpp:247 src/net/tmwa/generalhandler.cpp:189
 msgid "Unknown connection error."
 msgstr "未知的连接错误."
 
 #. TRANSLATORS: error message
-#: src/net/eathena/generalhandler.cpp:257 src/net/tmwa/generalhandler.cpp:280
+#: src/net/eathena/generalhandler.cpp:323 src/net/tmwa/generalhandler.cpp:279
 msgid "Got disconnected from server!"
 msgstr "和服务器失去连接!"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:282 src/net/tmwa/generalhandler.cpp:308
+#: src/net/eathena/generalhandler.cpp:348 src/net/tmwa/generalhandler.cpp:307
 msgid "Strength"
 msgstr "力量"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:283 src/net/tmwa/generalhandler.cpp:310
+#: src/net/eathena/generalhandler.cpp:349 src/net/tmwa/generalhandler.cpp:309
 msgid "Agility"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:284 src/net/tmwa/generalhandler.cpp:312
+#: src/net/eathena/generalhandler.cpp:350 src/net/tmwa/generalhandler.cpp:311
 msgid "Vitality"
 msgstr "生命"
 
-#. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:285 src/net/tmwa/generalhandler.cpp:314
+#: src/net/eathena/generalhandler.cpp:352 src/net/tmwa/generalhandler.cpp:314
 msgid "Intelligence"
 msgstr "智慧"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:286 src/net/tmwa/generalhandler.cpp:316
+#: src/net/eathena/generalhandler.cpp:353 src/net/tmwa/generalhandler.cpp:316
 msgid "Dexterity"
 msgstr "敏捷"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:287 src/net/tmwa/generalhandler.cpp:318
+#: src/net/eathena/generalhandler.cpp:354 src/net/tmwa/generalhandler.cpp:318
 msgid "Luck"
 msgstr "幸运"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:290 src/net/tmwa/generalhandler.cpp:323
+#: src/net/eathena/generalhandler.cpp:357 src/net/tmwa/generalhandler.cpp:322
 msgid "Defense"
 msgstr "防御"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:291 src/net/tmwa/generalhandler.cpp:325
+#: src/net/eathena/generalhandler.cpp:358 src/net/tmwa/generalhandler.cpp:324
 msgid "M.Attack"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:292 src/net/tmwa/generalhandler.cpp:327
+#: src/net/eathena/generalhandler.cpp:359 src/net/tmwa/generalhandler.cpp:326
 msgid "M.Defense"
 msgstr ""
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:294 src/net/tmwa/generalhandler.cpp:330
+#: src/net/eathena/generalhandler.cpp:361 src/net/tmwa/generalhandler.cpp:329
 #, no-c-format
 msgid "% Accuracy"
 msgstr "％精度"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:296 src/net/tmwa/generalhandler.cpp:333
+#: src/net/eathena/generalhandler.cpp:363 src/net/tmwa/generalhandler.cpp:332
 #, no-c-format
 msgid "% Evade"
 msgstr "％闪避"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:298 src/net/tmwa/generalhandler.cpp:336
+#: src/net/eathena/generalhandler.cpp:365 src/net/tmwa/generalhandler.cpp:335
 #, no-c-format
 msgid "% Critical"
 msgstr "％"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:299 src/net/tmwa/generalhandler.cpp:338
+#: src/net/eathena/generalhandler.cpp:366 src/net/tmwa/generalhandler.cpp:337
 msgid "Attack Delay"
 msgstr "攻击延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:300 src/net/tmwa/generalhandler.cpp:340
+#: src/net/eathena/generalhandler.cpp:367 src/net/tmwa/generalhandler.cpp:339
 msgid "Walk Delay"
 msgstr "步行延迟"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:301 src/net/tmwa/generalhandler.cpp:342
+#: src/net/eathena/generalhandler.cpp:368 src/net/tmwa/generalhandler.cpp:341
 msgid "Attack Range"
 msgstr "攻击范围"
 
 #. TRANSLATORS: player stat
-#: src/net/eathena/generalhandler.cpp:302 src/net/tmwa/generalhandler.cpp:344
+#: src/net/eathena/generalhandler.cpp:369 src/net/tmwa/generalhandler.cpp:343
 msgid "Damage per sec."
 msgstr "每秒伤害."
 
-#: src/net/eathena/skillhandler.cpp:228 src/net/eathena/skillhandler.cpp:288
-#, fuzzy, c-format
+#: src/net/eathena/generalhandler.cpp:370
+msgid "Karma"
+msgstr ""
+
+#: src/net/eathena/generalhandler.cpp:371
+msgid "Manner"
+msgstr ""
+
+#: src/net/eathena/skillhandler.cpp:304 src/net/eathena/skillhandler.cpp:364
+#, c-format
 msgid "Unknown skill error: %d"
-msgstr "未知的错误."
+msgstr ""
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:235 src/net/tmwa/skillhandler.cpp:224
+#: src/net/eathena/skillhandler.cpp:311 src/net/tmwa/skillhandler.cpp:224
 msgid "You have not yet reached a high enough lvl!"
 msgstr "你还没有达到足够的等级!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:239 src/net/tmwa/skillhandler.cpp:228
+#: src/net/eathena/skillhandler.cpp:315 src/net/tmwa/skillhandler.cpp:228
 msgid "Insufficient HP!"
 msgstr "HP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:243 src/net/tmwa/skillhandler.cpp:232
+#: src/net/eathena/skillhandler.cpp:319 src/net/tmwa/skillhandler.cpp:232
 msgid "Insufficient SP!"
 msgstr "SP不足!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:247 src/net/tmwa/skillhandler.cpp:236
+#: src/net/eathena/skillhandler.cpp:323 src/net/tmwa/skillhandler.cpp:236
 msgid "You have no memos!"
 msgstr "没有备忘录!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:251 src/net/tmwa/skillhandler.cpp:240
+#: src/net/eathena/skillhandler.cpp:327 src/net/tmwa/skillhandler.cpp:240
 msgid "You cannot do that right now!"
 msgstr "你无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:255 src/net/tmwa/skillhandler.cpp:244
+#: src/net/eathena/skillhandler.cpp:331 src/net/tmwa/skillhandler.cpp:244
 msgid "Seems you need more money... ;-)"
 msgstr "看起来需要更多金币... ;-)"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:259 src/net/tmwa/skillhandler.cpp:248
+#: src/net/eathena/skillhandler.cpp:335 src/net/tmwa/skillhandler.cpp:248
 msgid "You cannot use this skill with that kind of weapon!"
 msgstr "此武器无法用来使用此项技能!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:264 src/net/tmwa/skillhandler.cpp:253
+#: src/net/eathena/skillhandler.cpp:340 src/net/tmwa/skillhandler.cpp:253
 msgid "You need another red gem!"
 msgstr "你需要另一颗红宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:268 src/net/tmwa/skillhandler.cpp:257
+#: src/net/eathena/skillhandler.cpp:344 src/net/tmwa/skillhandler.cpp:257
 msgid "You need another blue gem!"
 msgstr "你需要另一颗蓝宝石!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:272 src/net/tmwa/skillhandler.cpp:261
+#: src/net/eathena/skillhandler.cpp:348 src/net/tmwa/skillhandler.cpp:261
 msgid "You're carrying to much to do this!"
 msgstr "你已负重太多，无法办到!"
 
 #. TRANSLATORS: error message
-#: src/net/eathena/skillhandler.cpp:276 src/net/tmwa/skillhandler.cpp:265
+#: src/net/eathena/skillhandler.cpp:352 src/net/tmwa/skillhandler.cpp:265
 msgid "Huh? What's that?"
 msgstr "啊？那是什么?"
 
@@ -7875,32 +8035,32 @@ msgid "%s wants to trade with you, do you accept?"
 msgstr "%s想和您进行交易，是否接受?"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:349
+#: src/net/tmwa/charserverhandler.cpp:351
 msgid "Strength:"
 msgstr "力量:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:351
+#: src/net/tmwa/charserverhandler.cpp:353
 msgid "Agility:"
 msgstr "敏捷:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:353
+#: src/net/tmwa/charserverhandler.cpp:355
 msgid "Vitality:"
 msgstr "生命:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:355
+#: src/net/tmwa/charserverhandler.cpp:357
 msgid "Intelligence:"
 msgstr "智力:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:357
+#: src/net/tmwa/charserverhandler.cpp:359
 msgid "Dexterity:"
 msgstr "灵巧:"
 
 #. TRANSLATORS: playe stat
-#: src/net/tmwa/charserverhandler.cpp:359
+#: src/net/tmwa/charserverhandler.cpp:361
 msgid "Luck:"
 msgstr "幸运:"
 
@@ -8211,269 +8371,309 @@ msgstr "你以退出帮会."
 
 #. TRANSLATORS: notification message
 #: src/resources/notifications.h:143
+#, fuzzy
+msgid "You cant left party on this map."
+msgstr "你以退出帮会."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:147
+#, fuzzy
+msgid "You was kicked from party."
+msgstr "踢从党"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:151
+msgid "You cant be kicked kicked from party on this map."
+msgstr ""
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:155
 #, c-format
 msgid "%s has joined your party."
 msgstr "%s已经加入你的党."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:147
+#: src/resources/notifications.h:159
 #, c-format
 msgid "%s is already a member of a party."
 msgstr "%s已经是你的帮会成员了."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:151
+#: src/resources/notifications.h:163
 #, c-format
 msgid "%s refused your invitation."
 msgstr "%s拒绝了您的邀请."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:155
+#: src/resources/notifications.h:167
 #, c-format
 msgid "%s is now a member of your party."
 msgstr "%s现在是你帮会中的成员了."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:159
+#: src/resources/notifications.h:171
 #, c-format
 msgid "%s can't join your party because party is full."
 msgstr "%s不能加入团队，因为团队成员已满."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:163
+#: src/resources/notifications.h:175
 #, c-format
 msgid "QQQ Unknown invite response for %s."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:191
+#: src/resources/notifications.h:203
 #, c-format
 msgid "%s has left your party."
 msgstr "%s已经离开你的帮会."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:195
+#: src/resources/notifications.h:207 src/resources/notifications.h:215
+#, fuzzy, c-format
+msgid "%s cant be kicked from party on this map."
+msgstr "%s已经被工会开除."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:211
+#, fuzzy, c-format
+msgid "%s has kicked from your party."
+msgstr "%s已经被工会开除."
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:219
 #, c-format
 msgid "An unknown member tried to say: %s"
 msgstr "一未知成员尝试说：%s"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:199
+#: src/resources/notifications.h:223
 #, c-format
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:203
+#: src/resources/notifications.h:227
 #, c-format
 msgid "You picked up %s."
 msgstr "你捡起了%s."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:207
+#: src/resources/notifications.h:231
 #, c-format
 msgid "You spent %s."
 msgstr "你花费 %s."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:211
+#: src/resources/notifications.h:235
 msgid "Cannot raise skill!"
 msgstr "不能提升技能!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:215
+#: src/resources/notifications.h:239
 msgid "Equip ammunition first."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:219
+#: src/resources/notifications.h:243
 #, c-format
 msgid "Trading with %s isn't possible. Trade partner is too far away."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:224
+#: src/resources/notifications.h:248
 #, c-format
 msgid "Trading with %s isn't possible. Character doesn't exist."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:228
+#: src/resources/notifications.h:252
 msgid "Trade cancelled due to an unknown reason."
 msgstr "交易取消因不明原因."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:232
+#: src/resources/notifications.h:256
 #, c-format
 msgid "Trade with %s cancelled."
 msgstr "与%s的交易被取消."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:236
+#: src/resources/notifications.h:260
 #, c-format
 msgid "Unhandled trade cancel packet with %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:240
+#: src/resources/notifications.h:264
 msgid "Failed adding item. Trade partner is over weighted."
 msgstr "添加项目失败。交易伙伴已经负重太多."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:244
+#: src/resources/notifications.h:268
 msgid "Failed adding item. Trade partner has no free slot."
 msgstr "添加项目失败。交易伙伴无空闲槽存放物品."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:248
+#: src/resources/notifications.h:272
 msgid "Failed adding item. You can't trade this item."
 msgstr "添加物品失败。您不能交易这项物品."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:252
+#: src/resources/notifications.h:276
 msgid "Failed adding item for unknown reason."
 msgstr "添加项目失败，原因未知."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:256
+#: src/resources/notifications.h:280
 msgid "Trade canceled."
 msgstr "交易取消."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:260
+#: src/resources/notifications.h:284
 msgid "Trade completed."
 msgstr "交易完成."
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:264
+#: src/resources/notifications.h:288
 msgid "Kick failed!"
 msgstr "踢出失败!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:268
+#: src/resources/notifications.h:292
 msgid "Kick succeeded!"
 msgstr "成功踢出!"
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:272
+#: src/resources/notifications.h:296
 #, c-format
 msgid "MVP player: %s"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:276
+#: src/resources/notifications.h:300
 msgid "All whispers ignored."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:280
+#: src/resources/notifications.h:304
 msgid "All whispers ignore failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:284
+#: src/resources/notifications.h:308
 msgid "All whispers unignored."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:288
+#: src/resources/notifications.h:312
 msgid "All whispers unignore failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:295
+#: src/resources/notifications.h:319
 msgid "pvp off, gvg off"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:299
+#: src/resources/notifications.h:323
 msgid "pvp on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:303
+#: src/resources/notifications.h:327
 msgid "gvg on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:307
+#: src/resources/notifications.h:331
 msgid "pvp on, gvg on"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:311
+#: src/resources/notifications.h:335
 msgid "unknown pvp"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:315
+#: src/resources/notifications.h:339
 #, c-format
 msgid "Char from account %s is already in your party!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:319
+#: src/resources/notifications.h:343
 #, c-format
 msgid "%s blocked invite!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:323
+#: src/resources/notifications.h:347
 msgid "Char is not online!"
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:327
+#: src/resources/notifications.h:351
 msgid "Pet catch failed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:331
+#: src/resources/notifications.h:355
 msgid "Pet catched."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:335
+#: src/resources/notifications.h:359
 #, c-format
 msgid "Pet catch unkown error: %d."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:339
+#: src/resources/notifications.h:363
 msgid "Your mercenary duty hour is over."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:343
+#: src/resources/notifications.h:367
 msgid "Your mercenary was killed."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:347
+#: src/resources/notifications.h:371
 msgid "Your mercenary was fired."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:351
+#: src/resources/notifications.h:375
 msgid "Your mercenary run away."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:355
+#: src/resources/notifications.h:379
 msgid "Mercenary unknown state."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:359
-msgid "Your feed your homunculus."
+#: src/resources/notifications.h:383
+msgid "You feed your homunculus."
 msgstr ""
 
 #. TRANSLATORS: notification message
-#: src/resources/notifications.h:363
+#: src/resources/notifications.h:387
 #, c-format
 msgid "You cant feed homunculus, because not have %s."
 msgstr ""
 
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:391
+#, fuzzy
+msgid "Card insert failed."
+msgstr "交易失败!"
+
+#. TRANSLATORS: notification message
+#: src/resources/notifications.h:395
+msgid "Card inserted."
+msgstr ""
+
 #. TRANSLATORS: chat option changed message
 #: src/utils/booleanoptions.h:27
 #, c-format