1 files changed, 252 insertions, 239 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index ed80bc5a8..6a337e8c7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-05-12 15:59+0300\n"
-"PO-Revision-Date: 2012-05-11 20:38+0000\n"
+"POT-Creation-Date: 2012-05-25 19:50+0300\n"
+"PO-Revision-Date: 2012-05-25 16:55+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
 "language/zh_CN/)\n"
@@ -21,134 +21,134 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: src/actionmanager.cpp:821
+#: src/actionmanager.cpp:825
 msgid "Ignoring incoming trade requests"
 msgstr "忽略新进的交易请求"
 
-#: src/actionmanager.cpp:830
+#: src/actionmanager.cpp:834
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1225
+#: src/actorspritemanager.cpp:1244
 msgid "Visible on map"
 msgstr "在地图上可见"
 
-#: src/being.cpp:344
+#: src/being.cpp:345
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:561
+#: src/being.cpp:562
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:561
+#: src/being.cpp:562
 msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1592 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1593 src/gui/whoisonline.cpp:768
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1597 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1598 src/gui/whoisonline.cpp:773
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:949 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
+#: src/client.cpp:962 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:107
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:956 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:969 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:961 src/gui/setup_video.cpp:237
+#: src/client.cpp:974 src/gui/setup_video.cpp:250
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:966
+#: src/client.cpp:979
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1052
+#: src/client.cpp:1065
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1090
+#: src/client.cpp:1103
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1124
+#: src/client.cpp:1137
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1230
+#: src/client.cpp:1243
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1265
+#: src/client.cpp:1278
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1275
+#: src/client.cpp:1288
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1318 src/client.cpp:1326 src/client.cpp:1461
+#: src/client.cpp:1331 src/client.cpp:1339 src/client.cpp:1474
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:281 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:176 src/gui/register.cpp:239
+#: src/gui/editserverdialog.cpp:176 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188 src/net/manaserv/charhandler.cpp:184
 #: src/net/manaserv/charhandler.cpp:227
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1336
+#: src/client.cpp:1349
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1362
+#: src/client.cpp:1375
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1363
+#: src/client.cpp:1376
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1382
+#: src/client.cpp:1395
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1383
+#: src/client.cpp:1396
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1403
+#: src/client.cpp:1416
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1404
+#: src/client.cpp:1417
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1627 src/client.cpp:1660 src/client.cpp:1675
-#: src/client.cpp:2111 src/client.cpp:2118
+#: src/client.cpp:1640 src/client.cpp:1673 src/client.cpp:1688
+#: src/client.cpp:2143 src/client.cpp:2150
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1818
+#: src/client.cpp:1831
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1852 src/client.cpp:1858
+#: src/client.cpp:1865 src/client.cpp:1871
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1879
+#: src/client.cpp:1892
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -341,39 +341,39 @@ msgstr "截图保存为"
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:567
+#: src/game.cpp:585
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:568
+#: src/game.cpp:586
 msgid "Network Error"
 msgstr "网络错误"
 
-#: src/game.cpp:953
+#: src/game.cpp:972
 msgid "Could Not Load Map"
 msgstr "不能加载地图"
 
-#: src/game.cpp:954
+#: src/game.cpp:973
 #, c-format
 msgid "Error while loading %s"
 msgstr "加载%s时出现错误"
 
-#: src/gui/beingpopup.cpp:124
+#: src/gui/beingpopup.cpp:125
 #, c-format
 msgid "Party: %s"
 msgstr "团队:%s"
 
-#: src/gui/beingpopup.cpp:138
+#: src/gui/beingpopup.cpp:139
 #, c-format
 msgid "Guild: %s"
 msgstr "工会:%s"
 
-#: src/gui/beingpopup.cpp:151
+#: src/gui/beingpopup.cpp:152
 #, c-format
 msgid "Pvp rank: %d"
 msgstr "Pvp等级: %d"
 
-#: src/gui/beingpopup.cpp:162
+#: src/gui/beingpopup.cpp:163
 #, c-format
 msgid "Comment: %s"
 msgstr "评论: %s"
@@ -446,7 +446,7 @@ msgstr "-"
 
 #: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:52 src/gui/quitdialog.cpp:53
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:263
+#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:264
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "退出"
@@ -482,10 +482,10 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1866 src/gui/popupmenu.cpp:1907
 #: src/gui/popupmenu.cpp:1959 src/gui/popupmenu.cpp:1983
 #: src/gui/popupmenu.cpp:2005 src/gui/quitdialog.cpp:57
-#: src/gui/register.cpp:83 src/gui/setupactiondata.h:1490 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1140 src/gui/textcommandeditor.cpp:241
-#: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
-#: src/gui/updaterwindow.cpp:171
+#: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1490
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1140
+#: src/gui/textcommandeditor.cpp:241 src/gui/textdialog.cpp:51
+#: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:171
 msgid "Cancel"
 msgstr "取消"
 
@@ -522,7 +522,7 @@ msgid "Change Password"
 msgstr "更换密码"
 
 #: src/gui/changepassworddialog.cpp:64 src/gui/logindialog.cpp:128
-#: src/gui/register.cpp:77 src/gui/unregisterdialog.cpp:56
+#: src/gui/registerdialog.cpp:77 src/gui/unregisterdialog.cpp:56
 msgid "Password:"
 msgstr "密码："
 
@@ -553,7 +553,7 @@ msgid "New Character"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:101 src/gui/editserverdialog.cpp:63
-#: src/gui/logindialog.cpp:127 src/gui/register.cpp:76
+#: src/gui/logindialog.cpp:127 src/gui/registerdialog.cpp:76
 msgid "Name:"
 msgstr "姓名"
 
@@ -593,15 +593,15 @@ msgstr ""
 msgid "Create"
 msgstr "建立"
 
-#: src/gui/charcreatedialog.cpp:127 src/gui/register.cpp:99
+#: src/gui/charcreatedialog.cpp:127 src/gui/registerdialog.cpp:99
 msgid "Male"
 msgstr "帅哥"
 
-#: src/gui/charcreatedialog.cpp:128 src/gui/register.cpp:100
+#: src/gui/charcreatedialog.cpp:128 src/gui/registerdialog.cpp:100
 msgid "Female"
 msgstr "美女"
 
-#: src/gui/charcreatedialog.cpp:129 src/gui/register.cpp:103
+#: src/gui/charcreatedialog.cpp:129 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1475 src/gui/setupactiondata.h:1548
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
 #: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
@@ -663,7 +663,7 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:268
+#: src/gui/charselectdialog.cpp:560 src/gui/serverdialog.cpp:269
 #: src/gui/setupactiondata.h:1495 src/gui/setup_relations.cpp:245
 #: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
 #: src/gui/textcommandeditor.cpp:244
@@ -683,84 +683,84 @@ msgstr "等级 %d"
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:120 src/gui/inventorywindow.cpp:72
+#: src/gui/chatwindow.cpp:121 src/gui/inventorywindow.cpp:72
 #: src/gui/setup_visual.cpp:102
 msgid "default"
 msgstr "默认"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:122
 msgid "black"
 msgstr "黑色"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:123
 msgid "red"
 msgstr "红色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:124
 msgid "green"
 msgstr "绿色"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:125
 msgid "blue"
 msgstr "蓝色"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:126
 msgid "gold"
 msgstr "金"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:127
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:128
 msgid "pink"
 msgstr "粉红色"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:129
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:130
 msgid "grey"
 msgstr "灰色"
 
-#: src/gui/chatwindow.cpp:130
+#: src/gui/chatwindow.cpp:131
 msgid "brown"
 msgstr "棕色"
 
-#: src/gui/chatwindow.cpp:131
+#: src/gui/chatwindow.cpp:132
 msgid "rainbow 1"
 msgstr "彩虹1"
 
-#: src/gui/chatwindow.cpp:132
+#: src/gui/chatwindow.cpp:133
 msgid "rainbow 2"
 msgstr "彩虹2"
 
-#: src/gui/chatwindow.cpp:133
+#: src/gui/chatwindow.cpp:134
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:151 src/gui/inventorywindow.cpp:92
+#: src/gui/chatwindow.cpp:152 src/gui/inventorywindow.cpp:92
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:81
 #: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:161 src/gui/setupactiondata.h:1547
+#: src/gui/chatwindow.cpp:162 src/gui/setupactiondata.h:1547
 #: src/gui/setup_chat.cpp:47
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:676
+#: src/gui/chatwindow.cpp:677
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1090
+#: src/gui/chatwindow.cpp:1091
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -934,25 +934,25 @@ msgstr "输入:%d 字节/"
 msgid "Out: %d bytes/s"
 msgstr ""
 
-#: src/gui/didyouknowwindow.cpp:51
+#: src/gui/didyouknowwindow.cpp:52
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:67 src/gui/helpwindow.cpp:63
+#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:64
 #: src/gui/inventorywindow.cpp:205 src/gui/npcdialog.cpp:54
 #: src/gui/popupmenu.cpp:501 src/gui/shopwindow.cpp:114
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/didyouknowwindow.cpp:68
+#: src/gui/didyouknowwindow.cpp:69
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
@@ -996,7 +996,7 @@ msgstr "装备"
 msgid "Unequip"
 msgstr "卸下装备"
 
-#: src/gui/helpwindow.cpp:47
+#: src/gui/helpwindow.cpp:48
 msgid "Help"
 msgstr "帮助"
 
@@ -1118,11 +1118,11 @@ msgstr "添加到出售商店。"
 msgid "Unknown."
 msgstr "未知。"
 
-#: src/gui/itempopup.cpp:177 src/gui/itempopup.cpp:183
+#: src/gui/itempopup.cpp:178 src/gui/itempopup.cpp:184
 msgid ", "
 msgstr ","
 
-#: src/gui/itempopup.cpp:193
+#: src/gui/itempopup.cpp:194
 #, c-format
 msgid "Weight: %s"
 msgstr "重量：%s"
@@ -1260,7 +1260,8 @@ msgstr "记住用户名"
 msgid "Update:"
 msgstr "更新日期："
 
-#: src/gui/logindialog.cpp:172 src/gui/register.cpp:66 src/gui/register.cpp:82
+#: src/gui/logindialog.cpp:172 src/gui/registerdialog.cpp:66
+#: src/gui/registerdialog.cpp:82
 msgid "Register"
 msgstr "注册"
 
@@ -1692,90 +1693,90 @@ msgstr "交换服务器"
 msgid "Switch character"
 msgstr "交换角色"
 
-#: src/gui/register.cpp:78
+#: src/gui/registerdialog.cpp:78
 msgid "Confirm:"
 msgstr "确认："
 
-#: src/gui/register.cpp:119
+#: src/gui/registerdialog.cpp:119
 msgid "Email:"
 msgstr "电子邮件"
 
-#: src/gui/register.cpp:187
+#: src/gui/registerdialog.cpp:187
 #, c-format
 msgid "The username needs to be at least %d characters long."
 msgstr "用户名至少需要%d个字符。"
 
-#: src/gui/register.cpp:195
+#: src/gui/registerdialog.cpp:195
 #, c-format
 msgid "The username needs to be less than %d characters long."
 msgstr "用户名不能少于%d个字符"
 
-#: src/gui/register.cpp:203 src/gui/unregisterdialog.cpp:121
+#: src/gui/registerdialog.cpp:203 src/gui/unregisterdialog.cpp:121
 #, c-format
 msgid "The password needs to be at least %d characters long."
 msgstr "密码需要至少%d个字符"
 
-#: src/gui/register.cpp:211 src/gui/unregisterdialog.cpp:128
+#: src/gui/registerdialog.cpp:211 src/gui/unregisterdialog.cpp:128
 #, c-format
 msgid "The password needs to be less than %d characters long."
 msgstr "密码不能少于%d个字符。"
 
-#: src/gui/register.cpp:218
+#: src/gui/registerdialog.cpp:218
 msgid "Passwords do not match."
 msgstr "密码不一致."
 
-#: src/gui/serverdialog.cpp:230
+#: src/gui/serverdialog.cpp:231
 msgid "Choose Your Server"
 msgstr "选择您的服务器"
 
-#: src/gui/serverdialog.cpp:241
+#: src/gui/serverdialog.cpp:242
 msgid "Choose Your Server  *** SAFE MODE ***"
 msgstr "选择你的服务器***安全模式***"
 
-#: src/gui/serverdialog.cpp:245
+#: src/gui/serverdialog.cpp:246
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:264
+#: src/gui/serverdialog.cpp:265
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:265
+#: src/gui/serverdialog.cpp:266
 msgid "Connect"
 msgstr "连接"
 
-#: src/gui/serverdialog.cpp:266 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:89
+#: src/gui/serverdialog.cpp:267 src/gui/shopwindow.cpp:122
+#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:267 src/gui/widgets/setupitem.cpp:285
-#: src/gui/widgets/setupitem.cpp:409
+#: src/gui/serverdialog.cpp:268 src/gui/widgets/setupitem.cpp:286
+#: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "编辑"
 
-#: src/gui/serverdialog.cpp:484
+#: src/gui/serverdialog.cpp:485
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:489
+#: src/gui/serverdialog.cpp:490
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:493
+#: src/gui/serverdialog.cpp:494
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:497
+#: src/gui/serverdialog.cpp:498
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:585
+#: src/gui/serverdialog.cpp:586
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:587
+#: src/gui/serverdialog.cpp:588
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2434,7 +2435,7 @@ msgstr ""
 msgid "Auto hide chat window."
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:54
+#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:55
 msgid "Colors"
 msgstr "颜色"
 
@@ -2534,50 +2535,50 @@ msgstr ""
 msgid "Show MVP messages"
 msgstr ""
 
-#: src/gui/setup_colors.cpp:49
+#: src/gui/setup_colors.cpp:50
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:75
+#: src/gui/setup_colors.cpp:76
 msgid "Type:"
 msgstr "类型:"
 
-#: src/gui/setup_colors.cpp:86 src/gui/setup_colors.cpp:407
+#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:408
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:89
-#: src/gui/setup_colors.cpp:408
+#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
+#: src/gui/setup_colors.cpp:409
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
+#: src/gui/setup_colors.cpp:410
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
-#: src/gui/setup_colors.cpp:409
+#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
+#: src/gui/setup_colors.cpp:410
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:97 src/gui/setup_colors.cpp:319
+#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:320
 msgid "Delay:"
 msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:112
+#: src/gui/setup_colors.cpp:113
 msgid "Red:"
 msgstr "红色："
 
-#: src/gui/setup_colors.cpp:127
+#: src/gui/setup_colors.cpp:128
 msgid "Green:"
 msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:142
+#: src/gui/setup_colors.cpp:143
 msgid "Blue:"
 msgstr "蓝色："
 
-#: src/gui/setup_colors.cpp:314
+#: src/gui/setup_colors.cpp:315
 msgid "Alpha:"
 msgstr "阿尔法："
 
@@ -2960,6 +2961,10 @@ msgstr ""
 msgid "Enable rectangular texture extension (OpenGL)"
 msgstr ""
 
+#: src/gui/setup_perfomance.cpp:102
+msgid "Use new texture internal format (OpenGL)"
+msgstr ""
+
 #: src/gui/setup_players.cpp:53
 msgid "Show gender"
 msgstr "显示性别"
@@ -3008,6 +3013,10 @@ msgstr ""
 msgid "Group friends in who is online window"
 msgstr ""
 
+#: src/gui/setup_players.cpp:89
+msgid "Hide erased players nicks"
+msgstr ""
+
 #: src/gui/setup_relations.cpp:63
 msgid "Relation"
 msgstr "关系"
@@ -3180,93 +3189,97 @@ msgstr "字体大小"
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
-#: src/gui/setup_video.cpp:508
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:496
+#: src/gui/setup_video.cpp:503
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:192
+#: src/gui/setup_video.cpp:200
 msgid "Software"
 msgstr "软件"
 
-#: src/gui/setup_video.cpp:193
+#: src/gui/setup_video.cpp:201
 msgid "Fast OpenGL"
 msgstr "快速的OpenGL"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:202
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:225
+#: src/gui/setup_video.cpp:233
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:226
+#: src/gui/setup_video.cpp:234
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:236
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:229
+#: src/gui/setup_video.cpp:237
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:238
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
-#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
+#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
+#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:253 src/gui/setup_video.cpp:256
-#: src/gui/setup_video.cpp:443 src/gui/setup_video.cpp:537
-#: src/gui/setup_video.cpp:549
+#: src/gui/setup_video.cpp:244
+msgid "Detect best mode"
+msgstr ""
+
+#: src/gui/setup_video.cpp:266 src/gui/setup_video.cpp:269
+#: src/gui/setup_video.cpp:438 src/gui/setup_video.cpp:532
+#: src/gui/setup_video.cpp:544
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:376
+#: src/gui/setup_video.cpp:371
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:382
+#: src/gui/setup_video.cpp:377
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:393
+#: src/gui/setup_video.cpp:388
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:394
+#: src/gui/setup_video.cpp:389
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:406
+#: src/gui/setup_video.cpp:401
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:407
+#: src/gui/setup_video.cpp:402
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:482
+#: src/gui/setup_video.cpp:477
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:483
+#: src/gui/setup_video.cpp:478
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
+#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:497
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3822,44 +3835,44 @@ msgstr "学校层次："
 msgid "Save"
 msgstr "保存"
 
-#: src/gui/tradewindow.cpp:60
+#: src/gui/tradewindow.cpp:61
 msgid "Propose trade"
 msgstr "打算交易"
 
-#: src/gui/tradewindow.cpp:61
+#: src/gui/tradewindow.cpp:62
 msgid "Confirmed. Waiting..."
 msgstr "已确认。等待中……"
 
-#: src/gui/tradewindow.cpp:62
+#: src/gui/tradewindow.cpp:63
 msgid "Agree trade"
 msgstr "同意交易"
 
-#: src/gui/tradewindow.cpp:63
+#: src/gui/tradewindow.cpp:64
 msgid "Agreed. Waiting..."
 msgstr "已同意。等待中……"
 
-#: src/gui/tradewindow.cpp:66
+#: src/gui/tradewindow.cpp:67
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/tradewindow.cpp:112 src/gui/tradewindow.cpp:168
+#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
-#: src/gui/tradewindow.cpp:113
+#: src/gui/tradewindow.cpp:114
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/tradewindow.cpp:117
+#: src/gui/tradewindow.cpp:118
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/tradewindow.cpp:376
+#: src/gui/tradewindow.cpp:377
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/tradewindow.cpp:455
+#: src/gui/tradewindow.cpp:456
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -4046,7 +4059,7 @@ msgstr "家居广场边界"
 msgid "Road Point"
 msgstr "路点"
 
-#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:617
+#: src/gui/whoisonline.cpp:80 src/gui/whoisonline.cpp:620
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -4058,11 +4071,11 @@ msgstr "更新"
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:634
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:674
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -4359,341 +4372,341 @@ msgstr "仓库"
 msgid "Cart"
 msgstr ""
 
-#: src/localplayer.cpp:380
+#: src/localplayer.cpp:385
 #, c-format
 msgid "You were killed by %s"
 msgstr ""
 
-#: src/localplayer.cpp:1433
+#: src/localplayer.cpp:1438
 msgid "Tried to pick up nonexistent item."
 msgstr ""
 
-#: src/localplayer.cpp:1436
+#: src/localplayer.cpp:1441
 msgid "Item is too heavy."
 msgstr "项目是太重了。"
 
-#: src/localplayer.cpp:1439
+#: src/localplayer.cpp:1444
 msgid "Item is too far away."
 msgstr "物品太远了。"
 
-#: src/localplayer.cpp:1442
+#: src/localplayer.cpp:1447
 msgid "Inventory is full."
 msgstr ""
 
-#: src/localplayer.cpp:1445
+#: src/localplayer.cpp:1450
 msgid "Stack is too big."
 msgstr ""
 
-#: src/localplayer.cpp:1448
+#: src/localplayer.cpp:1453
 msgid "Item belongs to someone else."
 msgstr ""
 
-#: src/localplayer.cpp:1451
+#: src/localplayer.cpp:1456
 msgid "Unknown problem picking up item."
 msgstr ""
 
 #. TRANSLATORS: %d is number,
 #. [@@%d|%s@@] - here player can see link to item
-#: src/localplayer.cpp:1475
+#: src/localplayer.cpp:1480
 #, c-format
 msgid "You picked up %d [@@%d|%s@@]."
 msgid_plural "You picked up %d [@@%d|%s@@]."
 msgstr[0] "你拾起%d[@@%d|%s @@]。"
 
-#: src/localplayer.cpp:1679 src/localplayer.cpp:1713 src/localplayer.cpp:1714
+#: src/localplayer.cpp:1684 src/localplayer.cpp:1718 src/localplayer.cpp:1719
 msgid "xp"
 msgstr ""
 
-#: src/localplayer.cpp:1719 src/localplayer.cpp:1726 src/localplayer.cpp:1733
+#: src/localplayer.cpp:1724 src/localplayer.cpp:1731 src/localplayer.cpp:1738
 msgid "job"
 msgstr ""
 
-#: src/localplayer.cpp:1906
+#: src/localplayer.cpp:1911
 msgid "(D) default moves"
 msgstr ""
 
-#: src/localplayer.cpp:1907
+#: src/localplayer.cpp:1912
 msgid "(I) invert moves"
 msgstr ""
 
-#: src/localplayer.cpp:1908
+#: src/localplayer.cpp:1913
 msgid "(c) moves with some crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1909
+#: src/localplayer.cpp:1914
 msgid "(C) moves with crazy moves"
 msgstr ""
 
-#: src/localplayer.cpp:1910
+#: src/localplayer.cpp:1915
 msgid "(d) double normal + crazy"
 msgstr ""
 
-#: src/localplayer.cpp:1911
+#: src/localplayer.cpp:1916
 msgid "(?) unknown move"
 msgstr ""
 
-#: src/localplayer.cpp:1933
+#: src/localplayer.cpp:1938
 #, c-format
 msgid "(%d) crazy move number %d"
 msgstr ""
 
-#: src/localplayer.cpp:1938
+#: src/localplayer.cpp:1943
 msgid "(a) custom crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1942
+#: src/localplayer.cpp:1947
 msgid "(?) crazy move"
 msgstr ""
 
-#: src/localplayer.cpp:1956
+#: src/localplayer.cpp:1961
 msgid "(0) default moves to target"
 msgstr ""
 
-#: src/localplayer.cpp:1957
+#: src/localplayer.cpp:1962
 msgid "(1) moves to target in distance 1"
 msgstr ""
 
-#: src/localplayer.cpp:1958
+#: src/localplayer.cpp:1963
 msgid "(2) moves to target in distance 2"
 msgstr ""
 
-#: src/localplayer.cpp:1959
+#: src/localplayer.cpp:1964
 msgid "(3) moves to target in distance 3"
 msgstr ""
 
-#: src/localplayer.cpp:1960
+#: src/localplayer.cpp:1965
 msgid "(5) moves to target in distance 5"
 msgstr ""
 
-#: src/localplayer.cpp:1961
+#: src/localplayer.cpp:1966
 msgid "(7) moves to target in distance 7"
 msgstr ""
 
-#: src/localplayer.cpp:1962
+#: src/localplayer.cpp:1967
 msgid "(A) moves to target in attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1963
+#: src/localplayer.cpp:1968
 msgid "(a) archer attack range"
 msgstr ""
 
-#: src/localplayer.cpp:1964
+#: src/localplayer.cpp:1969
 msgid "(?) move to target"
 msgstr "(?)移动到目标"
 
-#: src/localplayer.cpp:1983
+#: src/localplayer.cpp:1988
 msgid "(D) default follow"
 msgstr ""
 
-#: src/localplayer.cpp:1984
+#: src/localplayer.cpp:1989
 msgid "(R) relative follow"
 msgstr ""
 
-#: src/localplayer.cpp:1985
+#: src/localplayer.cpp:1990
 msgid "(M) mirror follow"
 msgstr ""
 
-#: src/localplayer.cpp:1986
+#: src/localplayer.cpp:1991
 msgid "(P) pet follow"
 msgstr ""
 
-#: src/localplayer.cpp:1987
+#: src/localplayer.cpp:1992
 msgid "(?) unknown follow"
 msgstr ""
 
-#: src/localplayer.cpp:2006 src/localplayer.cpp:2010 src/localplayer.cpp:2033
+#: src/localplayer.cpp:2011 src/localplayer.cpp:2015 src/localplayer.cpp:2038
 msgid "(?) attack"
 msgstr "(?) 攻击"
 
-#: src/localplayer.cpp:2007 src/localplayer.cpp:2029
+#: src/localplayer.cpp:2012 src/localplayer.cpp:2034
 msgid "(D) default attack"
 msgstr ""
 
-#: src/localplayer.cpp:2008
+#: src/localplayer.cpp:2013
 msgid "(s) switch attack without shield"
 msgstr ""
 
-#: src/localplayer.cpp:2009
+#: src/localplayer.cpp:2014
 msgid "(S) switch attack with shield"
 msgstr ""
 
-#: src/localplayer.cpp:2030
+#: src/localplayer.cpp:2035
 msgid "(G) go and attack"
 msgstr "(G) 去攻击"
 
-#: src/localplayer.cpp:2031
+#: src/localplayer.cpp:2036
 msgid "(A) go, attack, pickup"
 msgstr ""
 
-#: src/localplayer.cpp:2032
+#: src/localplayer.cpp:2037
 msgid "(d) without auto attack"
 msgstr ""
 
-#: src/localplayer.cpp:2084
+#: src/localplayer.cpp:2089
 msgid "(S) small pick up 1x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2085
+#: src/localplayer.cpp:2090
 msgid "(D) default pick up 2x1 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2086
+#: src/localplayer.cpp:2091
 msgid "(F) forward pick up 2x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2087
+#: src/localplayer.cpp:2092
 msgid "(3) pick up 3x3 cells"
 msgstr ""
 
-#: src/localplayer.cpp:2088
+#: src/localplayer.cpp:2093
 msgid "(g) go and pick up in distance 4"
 msgstr ""
 
-#: src/localplayer.cpp:2089
+#: src/localplayer.cpp:2094
 msgid "(G) go and pick up in distance 8"
 msgstr ""
 
-#: src/localplayer.cpp:2090
+#: src/localplayer.cpp:2095
 msgid "(A) go and pick up in max distance"
 msgstr ""
 
-#: src/localplayer.cpp:2091
+#: src/localplayer.cpp:2096
 msgid "(?) pick up"
 msgstr "(?)拿起"
 
-#: src/localplayer.cpp:2104
+#: src/localplayer.cpp:2109
 msgid "(N) normal map view"
 msgstr ""
 
-#: src/localplayer.cpp:2105
+#: src/localplayer.cpp:2110
 msgid "(D) debug map view"
 msgstr ""
 
-#: src/localplayer.cpp:2106
+#: src/localplayer.cpp:2111
 msgid "(u) ultra map view"
 msgstr ""
 
-#: src/localplayer.cpp:2107
+#: src/localplayer.cpp:2112
 msgid "(U) ultra map view 2"
 msgstr ""
 
-#: src/localplayer.cpp:2108
+#: src/localplayer.cpp:2113
 msgid "(e) empty map view"
 msgstr ""
 
-#: src/localplayer.cpp:2109
+#: src/localplayer.cpp:2114
 msgid "(b) black & white map view"
 msgstr ""
 
-#: src/localplayer.cpp:2128
+#: src/localplayer.cpp:2133
 msgid "(f) use #flar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2129
+#: src/localplayer.cpp:2134
 msgid "(c) use #chiza for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2130
+#: src/localplayer.cpp:2135
 msgid "(I) use #ingrav for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2131
+#: src/localplayer.cpp:2136
 msgid "(F) use #frillyar for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2132
+#: src/localplayer.cpp:2137
 msgid "(U) use #upmarmu for magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2133
+#: src/localplayer.cpp:2138
 msgid "(?) magic attack"
 msgstr ""
 
-#: src/localplayer.cpp:2152
+#: src/localplayer.cpp:2157
 msgid "(a) attack all players"
 msgstr ""
 
-#: src/localplayer.cpp:2153
+#: src/localplayer.cpp:2158
 msgid "(f) attack all except friends"
 msgstr ""
 
-#: src/localplayer.cpp:2154
+#: src/localplayer.cpp:2159
 msgid "(b) attack bad relations"
 msgstr ""
 
-#: src/localplayer.cpp:2155
+#: src/localplayer.cpp:2160
 msgid "(d) don't attack players"
 msgstr ""
 
-#: src/localplayer.cpp:2156
+#: src/localplayer.cpp:2161
 msgid "(?) pvp attack"
 msgstr ""
 
-#: src/localplayer.cpp:2175
+#: src/localplayer.cpp:2180
 msgid "(D) default imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2176
+#: src/localplayer.cpp:2181
 msgid "(O) outfits imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2177
+#: src/localplayer.cpp:2182
 msgid "(?) imitation"
 msgstr ""
 
-#: src/localplayer.cpp:2205
+#: src/localplayer.cpp:2210
 msgid "Away"
 msgstr "距离"
 
-#: src/localplayer.cpp:2225
+#: src/localplayer.cpp:2230
 msgid "(O) on keyboard"
 msgstr ""
 
-#: src/localplayer.cpp:2226
+#: src/localplayer.cpp:2231
 msgid "(A) away"
 msgstr ""
 
-#: src/localplayer.cpp:2227 src/localplayer.cpp:2242
+#: src/localplayer.cpp:2232 src/localplayer.cpp:2247
 msgid "(?) away"
 msgstr ""
 
-#: src/localplayer.cpp:2240
+#: src/localplayer.cpp:2245
 msgid "(G) game camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2241
+#: src/localplayer.cpp:2246
 msgid "(F) free camera mode"
 msgstr ""
 
-#: src/localplayer.cpp:2266
+#: src/localplayer.cpp:2271
 msgid "Game modifiers are enabled"
 msgstr ""
 
-#: src/localplayer.cpp:2267
+#: src/localplayer.cpp:2272
 msgid "Game modifiers are disabled"
 msgstr ""
 
-#: src/localplayer.cpp:2268
+#: src/localplayer.cpp:2273
 msgid "Game modifiers are unknown"
 msgstr ""
 
-#: src/localplayer.cpp:3785
+#: src/localplayer.cpp:3790
 msgid "Follow: "
 msgstr "跟随:"
 
-#: src/localplayer.cpp:3787 src/localplayer.cpp:3802
+#: src/localplayer.cpp:3792 src/localplayer.cpp:3807
 msgid "Follow canceled"
 msgstr ""
 
-#: src/localplayer.cpp:3794
+#: src/localplayer.cpp:3799
 msgid "Imitation: "
 msgstr ""
 
-#: src/localplayer.cpp:3796 src/localplayer.cpp:3804
+#: src/localplayer.cpp:3801 src/localplayer.cpp:3809
 msgid "Imitation canceled"
 msgstr ""
 
-#: src/localplayer.cpp:4153
+#: src/localplayer.cpp:4158
 msgid "You see "
 msgstr "你看"