1 files changed, 238 insertions, 234 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 7dbdbe86b..6e64dd92b 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-08-04 18:32+0300\n"
-"PO-Revision-Date: 2012-08-04 12:05+0000\n"
+"POT-Creation-Date: 2012-08-15 02:22+0300\n"
+"PO-Revision-Date: 2012-08-14 23:25+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"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1269
+#: src/actorspritemanager.cpp:1271
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -37,117 +37,117 @@ msgstr "在地图上可见"
 msgid "Human"
 msgstr ""
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "dodge"
 msgstr "躲闪"
 
-#: src/being.cpp:520
+#: src/being.cpp:522
 msgid "miss"
 msgstr "无法出售无法出售的物品。"
 
 #. TRANSLATORS: this away status writed in player nick
-#: src/being.cpp:1556 src/gui/whoisonline.cpp:765
+#: src/being.cpp:1558 src/gui/whoisonline.cpp:775
 msgid "A"
 msgstr "A"
 
 #. TRANSLATORS: this inactive status writed in player nick
-#: src/being.cpp:1561 src/gui/whoisonline.cpp:770
+#: src/being.cpp:1563 src/gui/whoisonline.cpp:780
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:981 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
+#: src/client.cpp:990 src/gui/setup.cpp:55 src/gui/windowmenu.cpp:109
 msgid "Setup"
 msgstr "魔法攻击"
 
-#: src/client.cpp:988 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:997 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:993 src/gui/setup_video.cpp:250
+#: src/client.cpp:1002 src/gui/setup_video.cpp:244
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:998
+#: src/client.cpp:1007
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1084
+#: src/client.cpp:1093
 msgid "Connecting to server"
 msgstr "魔法防御"
 
-#: src/client.cpp:1122
+#: src/client.cpp:1131
 msgid "Logging in"
 msgstr "尝试捡起不存在的物品。"
 
-#: src/client.cpp:1156
+#: src/client.cpp:1165
 msgid "Entering game world"
 msgstr "捡起物品发生不存在的物品。"
 
-#: src/client.cpp:1262
+#: src/client.cpp:1271
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1297
+#: src/client.cpp:1306
 msgid "Connecting to the game server"
 msgstr "连接到游戏服务器"
 
-#: src/client.cpp:1307
+#: src/client.cpp:1316
 msgid "Changing game servers"
 msgstr "更改游戏服务器"
 
-#: src/client.cpp:1350 src/client.cpp:1358 src/client.cpp:1493
+#: src/client.cpp:1359 src/client.cpp:1367 src/client.cpp:1502
 #: src/gui/changeemaildialog.cpp:157 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:290 src/gui/charselectdialog.cpp:271
-#: src/gui/editserverdialog.cpp:196 src/gui/registerdialog.cpp:239
+#: src/gui/editserverdialog.cpp:203 src/gui/registerdialog.cpp:239
 #: src/gui/unregisterdialog.cpp:137 src/net/ea/charserverhandler.cpp:170
 #: src/net/ea/charserverhandler.cpp:188
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1368
+#: src/client.cpp:1377
 msgid "Requesting registration details"
 msgstr "请求注册的详细信息"
 
-#: src/client.cpp:1394
+#: src/client.cpp:1403
 msgid "Password Change"
 msgstr "密码更改"
 
-#: src/client.cpp:1395
+#: src/client.cpp:1404
 msgid "Password changed successfully!"
 msgstr "更改密码成功！"
 
-#: src/client.cpp:1414
+#: src/client.cpp:1423
 msgid "Email Change"
 msgstr "更改电子邮件"
 
-#: src/client.cpp:1415
+#: src/client.cpp:1424
 msgid "Email changed successfully!"
 msgstr "更改电子邮件成功！"
 
-#: src/client.cpp:1435
+#: src/client.cpp:1444
 msgid "Unregister Successful"
 msgstr "注销成功"
 
-#: src/client.cpp:1436
+#: src/client.cpp:1445
 msgid "Farewell, come back any time..."
 msgstr "再见，随时欢迎回来... ..."
 
-#: src/client.cpp:1659 src/client.cpp:1692 src/client.cpp:1707
-#: src/client.cpp:2152 src/client.cpp:2159
+#: src/client.cpp:1669 src/client.cpp:1680 src/client.cpp:1713
+#: src/client.cpp:1728 src/client.cpp:2175 src/client.cpp:2182
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，并且无法创建！退出。"
 
-#: src/client.cpp:1850
+#: src/client.cpp:1871
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "无效的更新主机: %s"
 
-#: src/client.cpp:1884 src/client.cpp:1890
+#: src/client.cpp:1905 src/client.cpp:1911
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:1911
+#: src/client.cpp:1932
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在并且无法创建！退出。"
@@ -260,62 +260,62 @@ msgstr "玩家成功删除！"
 msgid "Player could not be erased!"
 msgstr "玩家无法删除！"
 
-#: src/commandhandler.cpp:954 src/commandhandler.cpp:1000
+#: src/commandhandler.cpp:956 src/commandhandler.cpp:1002
 #, c-format
 msgid "Client uptime: %s"
 msgstr ""
 
-#: src/commandhandler.cpp:964
+#: src/commandhandler.cpp:966
 #, c-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:973
+#: src/commandhandler.cpp:975
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:981
+#: src/commandhandler.cpp:983
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:989
+#: src/commandhandler.cpp:991
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:997
+#: src/commandhandler.cpp:999
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] ""
 
-#: src/commandhandler.cpp:1076
+#: src/commandhandler.cpp:1078
 msgid "font cache size"
 msgstr "字体缓存大小"
 
-#: src/commandhandler.cpp:1088
+#: src/commandhandler.cpp:1090
 msgid "Cache size:"
 msgstr ""
 
-#: src/commandhandler.cpp:1092
+#: src/commandhandler.cpp:1094
 msgid "Created:"
 msgstr "创建于："
 
-#: src/commandhandler.cpp:1094
+#: src/commandhandler.cpp:1096
 msgid "Deleted:"
 msgstr "删除："
 
-#: src/commandhandler.cpp:1289 src/commandhandler.cpp:1296
+#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
 msgid "Resource images:"
 msgstr ""
 
-#: src/commandhandler.cpp:1291 src/commandhandler.cpp:1298
+#: src/commandhandler.cpp:1293 src/commandhandler.cpp:1300
 msgid "Resource orphaned images:"
 msgstr ""
 
@@ -332,19 +332,19 @@ msgstr "常规"
 msgid "Debug"
 msgstr "调试 "
 
-#: src/game.cpp:529
+#: src/game.cpp:534
 msgid "Screenshot saved as "
 msgstr "截图保存为"
 
-#: src/game.cpp:537
+#: src/game.cpp:542
 msgid "Saving screenshot failed!"
 msgstr "保存屏幕快照失败！"
 
-#: src/game.cpp:598
+#: src/game.cpp:603
 msgid "The connection to the server was lost."
 msgstr "服务器的连接丢失。"
 
-#: src/game.cpp:599
+#: src/game.cpp:604
 msgid "Network Error"
 msgstr "网络错误"
 
@@ -399,50 +399,50 @@ msgstr "移动"
 msgid "Result"
 msgstr "结果"
 
-#: src/gui/botcheckerwindow.cpp:312 src/gui/npcdialog.cpp:154
+#: src/gui/botcheckerwindow.cpp:313 src/gui/npcdialog.cpp:154
 msgid "Reset"
 msgstr "重置"
 
-#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:111
+#: src/gui/buydialog.cpp:58 src/gui/buydialog.cpp:65 src/gui/buydialog.cpp:112
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:209
 #: src/gui/popupmenu.cpp:2119
 msgid "Buy"
 msgstr "购买"
 
-#: src/gui/buydialog.cpp:94 src/gui/buydialog.cpp:331
-#: src/gui/selldialog.cpp:88 src/gui/selldialog.cpp:325
+#: src/gui/buydialog.cpp:95 src/gui/buydialog.cpp:332
+#: src/gui/selldialog.cpp:89 src/gui/selldialog.cpp:326
 #, c-format
 msgid "Price: %s / Total: %s"
 msgstr "价格：%s / 总价：%s"
 
-#: src/gui/buydialog.cpp:102
+#: src/gui/buydialog.cpp:103
 msgid "Amount:"
 msgstr ""
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'increasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:107 src/gui/itemamountwindow.cpp:205
+#: src/gui/buydialog.cpp:108 src/gui/itemamountwindow.cpp:205
 #: src/gui/itemamountwindow.cpp:233 src/gui/npcdialog.cpp:143
-#: src/gui/selldialog.cpp:91 src/gui/statuswindow.cpp:792
+#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:792
 msgid "+"
 msgstr "+"
 
 #. TRANSLATORS: This is a narrow symbol used to denote 'decreasing'.
 #. You may change this symbol if your language uses another.
-#: src/gui/buydialog.cpp:110 src/gui/itemamountwindow.cpp:204
+#: src/gui/buydialog.cpp:111 src/gui/itemamountwindow.cpp:204
 #: src/gui/itemamountwindow.cpp:232 src/gui/npcdialog.cpp:144
-#: src/gui/selldialog.cpp:92 src/gui/statuswindow.cpp:804
+#: src/gui/selldialog.cpp:93 src/gui/statuswindow.cpp:804
 msgid "-"
 msgstr "-"
 
-#: src/gui/buydialog.cpp:112 src/gui/quitdialog.cpp:49
+#: src/gui/buydialog.cpp:113 src/gui/quitdialog.cpp:49
 #: src/gui/quitdialog.cpp:50 src/gui/quitdialog.cpp:51
-#: src/gui/selldialog.cpp:94 src/gui/serverdialog.cpp:277
+#: src/gui/selldialog.cpp:95 src/gui/serverdialog.cpp:278
 #: src/gui/setupactiondata.h:158
 msgid "Quit"
 msgstr "退出"
 
-#: src/gui/buydialog.cpp:113 src/gui/selldialog.cpp:95
+#: src/gui/buydialog.cpp:114 src/gui/selldialog.cpp:96
 #: src/gui/statuswindow.cpp:534 src/gui/statuswindow.cpp:590
 #: src/gui/statuswindow.cpp:791 src/gui/statuswindow.cpp:822
 msgid "Max"
@@ -455,13 +455,13 @@ msgstr "商店"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/popupmenu.cpp:210
 #: src/gui/popupmenu.cpp:2120 src/gui/selldialog.cpp:53
-#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:93
+#: src/gui/selldialog.cpp:60 src/gui/selldialog.cpp:94
 msgid "Sell"
 msgstr "出售"
 
 #: src/gui/buyselldialog.cpp:65 src/gui/changeemaildialog.cpp:59
 #: src/gui/changepassworddialog.cpp:61 src/gui/charcreatedialog.cpp:134
-#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:90
+#: src/gui/connectiondialog.cpp:47 src/gui/editserverdialog.cpp:91
 #: src/gui/itemamountwindow.cpp:207 src/gui/npcpostdialog.cpp:58
 #: src/gui/popupmenu.cpp:260 src/gui/popupmenu.cpp:291
 #: src/gui/popupmenu.cpp:366 src/gui/popupmenu.cpp:404
@@ -474,7 +474,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:1981 src/gui/popupmenu.cpp:2005
 #: src/gui/popupmenu.cpp:2027 src/gui/quitdialog.cpp:55
 #: src/gui/registerdialog.cpp:83 src/gui/setupactiondata.h:1500
-#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1135
+#: src/gui/setup.cpp:73 src/gui/socialwindow.cpp:1143
 #: src/gui/textcommandeditor.cpp:194 src/gui/textdialog.cpp:51
 #: src/gui/unregisterdialog.cpp:59 src/gui/updaterwindow.cpp:172
 msgid "Cancel"
@@ -580,7 +580,7 @@ msgid "Race:"
 msgstr ""
 
 #: src/gui/charcreatedialog.cpp:133 src/gui/charselectdialog.cpp:630
-#: src/gui/socialwindow.cpp:1197
+#: src/gui/socialwindow.cpp:1205
 msgid "Create"
 msgstr "建立"
 
@@ -595,7 +595,7 @@ msgstr "美女"
 #: src/gui/charcreatedialog.cpp:137 src/gui/registerdialog.cpp:103
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
 #: src/gui/setup_audio.cpp:120 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:209 src/gui/setup_visual.cpp:96
+#: src/gui/setup_other.cpp:212 src/gui/setup_visual.cpp:96
 msgid "Other"
 msgstr "其他"
 
@@ -654,9 +654,9 @@ msgstr "删除字符输入的密码"
 msgid "Enter password:"
 msgstr "输入密码："
 
-#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:282
+#: src/gui/charselectdialog.cpp:561 src/gui/serverdialog.cpp:283
 #: src/gui/setupactiondata.h:1505 src/gui/setup_relations.cpp:245
-#: src/gui/shopwindow.cpp:123 src/gui/shopwindow.cpp:126
+#: src/gui/shopwindow.cpp:125 src/gui/shopwindow.cpp:128
 #: src/gui/textcommandeditor.cpp:196
 msgid "Delete"
 msgstr "删除"
@@ -735,7 +735,7 @@ msgstr "彩虹3"
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:76
 #: src/gui/logindialog.cpp:104 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:156
-#: src/gui/setup_video.cpp:217 src/gui/textcommandeditor.cpp:100
+#: src/gui/setup_video.cpp:215 src/gui/textcommandeditor.cpp:100
 #: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/extendednamesmodel.cpp:49 src/gui/widgets/namesmodel.cpp:48
 msgid "???"
@@ -929,26 +929,26 @@ msgstr ""
 msgid "Did You Know?"
 msgstr "你知道吗？"
 
-#: src/gui/didyouknowwindow.cpp:68 src/gui/helpwindow.cpp:65
+#: src/gui/didyouknowwindow.cpp:69 src/gui/helpwindow.cpp:65
 #: src/gui/inventorywindow.cpp:210 src/gui/npcdialog.cpp:60
 #: src/gui/npcdialog.cpp:140 src/gui/popupmenu.cpp:502
-#: src/gui/questswindow.cpp:95 src/gui/shopwindow.cpp:114
+#: src/gui/questswindow.cpp:97 src/gui/shopwindow.cpp:116
 msgid "Close"
 msgstr "关闭"
 
-#: src/gui/didyouknowwindow.cpp:69
+#: src/gui/didyouknowwindow.cpp:70
 msgid "< Previous"
 msgstr "<上一页"
 
-#: src/gui/didyouknowwindow.cpp:70
+#: src/gui/didyouknowwindow.cpp:71
 msgid "Next >"
 msgstr "下一页>"
 
-#: src/gui/didyouknowwindow.cpp:71
+#: src/gui/didyouknowwindow.cpp:72
 msgid "Auto open this window"
 msgstr "自动打开这个窗口"
 
-#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:89
+#: src/gui/editdialog.cpp:46 src/gui/editserverdialog.cpp:90
 #: src/gui/itemamountwindow.cpp:206 src/gui/okdialog.cpp:48
 #: src/gui/quitdialog.cpp:54 src/gui/textdialog.cpp:50
 msgid "OK"
@@ -974,7 +974,11 @@ msgstr "服务器类型："
 msgid "Description:"
 msgstr ""
 
-#: src/gui/editserverdialog.cpp:197
+#: src/gui/editserverdialog.cpp:89 src/gui/serverdialog.cpp:280
+msgid "Connect"
+msgstr "连接"
+
+#: src/gui/editserverdialog.cpp:204
 msgid "Please at least type both the address and the port of the server."
 msgstr ""
 
@@ -1027,8 +1031,8 @@ msgid "Filter:"
 msgstr "过滤器："
 
 #: src/gui/inventorywindow.cpp:163 src/gui/inventorywindow.cpp:594
-#: src/gui/popupmenu.cpp:1661 src/gui/popupmenu.cpp:1762
-#: src/gui/popupmenu.cpp:1818
+#: src/gui/outfitwindow.cpp:97 src/gui/popupmenu.cpp:1661
+#: src/gui/popupmenu.cpp:1762 src/gui/popupmenu.cpp:1818
 msgid "Equip"
 msgstr "装备"
 
@@ -1348,12 +1352,12 @@ msgstr "发送"
 msgid "Failed to send as sender or letter invalid."
 msgstr "发送信件失败或者信件无效。"
 
-#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:535
+#: src/gui/outfitwindow.cpp:90 src/gui/outfitwindow.cpp:544
 #, c-format
 msgid "Outfit: %d"
 msgstr "套装： %d"
 
-#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:537
+#: src/gui/outfitwindow.cpp:92 src/gui/outfitwindow.cpp:546
 #: src/gui/windowmenu.cpp:292
 #, c-format
 msgid "Key: %s"
@@ -1363,7 +1367,7 @@ msgstr "按键：%s"
 msgid "Unequip first"
 msgstr ""
 
-#: src/gui/outfitwindow.cpp:98
+#: src/gui/outfitwindow.cpp:99
 msgid "Away outfit"
 msgstr ""
 
@@ -1507,7 +1511,7 @@ msgstr "启用远"
 msgid "Disable away"
 msgstr ""
 
-#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1199
+#: src/gui/popupmenu.cpp:523 src/gui/socialwindow.cpp:1207
 msgid "Leave"
 msgstr "留下"
 
@@ -1622,7 +1626,7 @@ msgstr ""
 
 #: src/gui/popupmenu.cpp:1948 src/gui/popupmenu.cpp:1999
 #: src/gui/setup_theme.cpp:62 src/gui/setup_theme.cpp:126
-#: src/gui/socialwindow.cpp:883
+#: src/gui/socialwindow.cpp:888
 msgid "(default)"
 msgstr "(默认)"
 
@@ -1703,11 +1707,11 @@ msgstr ""
 msgid "Add to pickup list"
 msgstr ""
 
-#: src/gui/questswindow.cpp:86 src/gui/windowmenu.cpp:74
+#: src/gui/questswindow.cpp:88 src/gui/windowmenu.cpp:74
 msgid "Quests"
 msgstr ""
 
-#: src/gui/questswindow.cpp:191 src/gui/setup_input.cpp:354
+#: src/gui/questswindow.cpp:195 src/gui/setup_input.cpp:355
 msgid "unknown"
 msgstr ""
 
@@ -1763,46 +1767,42 @@ msgstr "选择你的服务器***安全模式***"
 msgid "Use same ip for game sub servers"
 msgstr "游戏分服务器使用相同的IP"
 
-#: src/gui/serverdialog.cpp:278
+#: src/gui/serverdialog.cpp:279
 msgid "Load"
 msgstr "负载"
 
-#: src/gui/serverdialog.cpp:279
-msgid "Connect"
-msgstr "连接"
-
-#: src/gui/serverdialog.cpp:280 src/gui/shopwindow.cpp:122
-#: src/gui/shopwindow.cpp:125 src/gui/tradewindow.cpp:90
+#: src/gui/serverdialog.cpp:281 src/gui/shopwindow.cpp:124
+#: src/gui/shopwindow.cpp:127 src/gui/tradewindow.cpp:90
 msgid "Add"
 msgstr "添加"
 
-#: src/gui/serverdialog.cpp:281 src/gui/widgets/setupitem.cpp:286
+#: src/gui/serverdialog.cpp:282 src/gui/widgets/setupitem.cpp:286
 #: src/gui/widgets/setupitem.cpp:410
 msgid "Edit"
 msgstr "编辑"
 
-#: src/gui/serverdialog.cpp:498
+#: src/gui/serverdialog.cpp:505
 #, c-format
 msgid "Downloading server list...%2.2f%%"
 msgstr "下载服务器列表...%2.2f%%"
 
-#: src/gui/serverdialog.cpp:503
+#: src/gui/serverdialog.cpp:510
 msgid "Waiting for server..."
 msgstr "等待服务器..."
 
-#: src/gui/serverdialog.cpp:507
+#: src/gui/serverdialog.cpp:514
 msgid "Preparing download"
 msgstr "准备下载"
 
-#: src/gui/serverdialog.cpp:511
+#: src/gui/serverdialog.cpp:518
 msgid "Error retreiving server list!"
 msgstr "恢复服务器列表错误！"
 
-#: src/gui/serverdialog.cpp:599
+#: src/gui/serverdialog.cpp:606
 msgid "requires a newer version"
 msgstr "需要较新版本"
 
-#: src/gui/serverdialog.cpp:601
+#: src/gui/serverdialog.cpp:608
 #, c-format
 msgid "requires v%s"
 msgstr "需要 v%s"
@@ -2345,7 +2345,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr ""
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:181
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:184
 msgid "Windows"
 msgstr ""
 
@@ -2573,46 +2573,46 @@ msgstr ""
 msgid "This is what the color looks like"
 msgstr "这就是该色彩看起来的样子"
 
-#: src/gui/setup_colors.cpp:76
+#: src/gui/setup_colors.cpp:77
 msgid "Type:"
 msgstr "类型:"
 
-#: src/gui/setup_colors.cpp:87 src/gui/setup_colors.cpp:410
+#: src/gui/setup_colors.cpp:88 src/gui/setup_colors.cpp:411
 msgid "Static"
 msgstr "静止的"
 
-#: src/gui/setup_colors.cpp:89 src/gui/setup_colors.cpp:90
-#: src/gui/setup_colors.cpp:411
+#: src/gui/setup_colors.cpp:90 src/gui/setup_colors.cpp:91
+#: src/gui/setup_colors.cpp:412
 msgid "Pulse"
 msgstr "脉冲"
 
-#: src/gui/setup_colors.cpp:91 src/gui/setup_colors.cpp:92
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:92 src/gui/setup_colors.cpp:93
+#: src/gui/setup_colors.cpp:413
 msgid "Rainbow"
 msgstr "彩虹"
 
-#: src/gui/setup_colors.cpp:93 src/gui/setup_colors.cpp:94
-#: src/gui/setup_colors.cpp:412
+#: src/gui/setup_colors.cpp:94 src/gui/setup_colors.cpp:95
+#: src/gui/setup_colors.cpp:413
 msgid "Spectrum"
 msgstr "色谱"
 
-#: src/gui/setup_colors.cpp:98 src/gui/setup_colors.cpp:322
+#: src/gui/setup_colors.cpp:99 src/gui/setup_colors.cpp:323
 msgid "Delay:"
 msgstr "延迟："
 
-#: src/gui/setup_colors.cpp:113
+#: src/gui/setup_colors.cpp:114
 msgid "Red:"
 msgstr "红色："
 
-#: src/gui/setup_colors.cpp:128
+#: src/gui/setup_colors.cpp:129
 msgid "Green:"
 msgstr "绿色："
 
-#: src/gui/setup_colors.cpp:143
+#: src/gui/setup_colors.cpp:144
 msgid "Blue:"
 msgstr "蓝色："
 
-#: src/gui/setup_colors.cpp:317
+#: src/gui/setup_colors.cpp:318
 msgid "Alpha:"
 msgstr "阿尔法："
 
@@ -2628,27 +2628,27 @@ msgstr "重置窗口"
 msgid "Input"
 msgstr ""
 
-#: src/gui/setup_input.cpp:124
+#: src/gui/setup_input.cpp:125
 msgid "Assign"
 msgstr "分配"
 
-#: src/gui/setup_input.cpp:128
+#: src/gui/setup_input.cpp:129
 msgid "Unassign"
 msgstr "取消分配"
 
-#: src/gui/setup_input.cpp:132
+#: src/gui/setup_input.cpp:133
 msgid "Reset all keys"
 msgstr ""
 
-#: src/gui/setup_input.cpp:135
+#: src/gui/setup_input.cpp:136
 msgid "Default"
 msgstr "预设"
 
-#: src/gui/setup_input.cpp:195
+#: src/gui/setup_input.cpp:196
 msgid "Key Conflict(s) Detected."
 msgstr "检测到按键冲突。"
 
-#: src/gui/setup_input.cpp:196
+#: src/gui/setup_input.cpp:197
 #, c-format
 msgid ""
 "Conflict \"%s\" and \"%s\" keys. Resolve them, or gameplay may result in "
@@ -2828,106 +2828,110 @@ msgid "Enable shop mode"
 msgstr "启用商店模式"
 
 #: src/gui/setup_other.cpp:158
+msgid "Cycle npc targets"
+msgstr ""
+
+#: src/gui/setup_other.cpp:161
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:162
+#: src/gui/setup_other.cpp:165
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:167
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:167
+#: src/gui/setup_other.cpp:170
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:172
+#: src/gui/setup_other.cpp:175
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:174
+#: src/gui/setup_other.cpp:177
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:177
+#: src/gui/setup_other.cpp:180
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:184
+#: src/gui/setup_other.cpp:187
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:185
+#: src/gui/setup_other.cpp:188
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:186
+#: src/gui/setup_other.cpp:189
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:187
+#: src/gui/setup_other.cpp:190
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:194
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:194
+#: src/gui/setup_other.cpp:197
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:195
+#: src/gui/setup_other.cpp:198
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:201
+#: src/gui/setup_other.cpp:204
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:202
+#: src/gui/setup_other.cpp:205
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:208
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:211
+#: src/gui/setup_other.cpp:214
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:214
+#: src/gui/setup_other.cpp:217
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:217
+#: src/gui/setup_other.cpp:220
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:224
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:224
+#: src/gui/setup_other.cpp:227
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:227
+#: src/gui/setup_other.cpp:230
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:233
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:235
+#: src/gui/setup_other.cpp:236
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:238
+#: src/gui/setup_other.cpp:239
 msgid "Show background"
 msgstr "显示背景"
 
@@ -3255,97 +3259,97 @@ msgstr ""
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:496
-#: src/gui/setup_video.cpp:503
+#: src/gui/setup_theme.cpp:372 src/gui/setup_video.cpp:489
+#: src/gui/setup_video.cpp:496
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:200
+#: src/gui/setup_video.cpp:198
 msgid "Software"
 msgstr "软件"
 
-#: src/gui/setup_video.cpp:201
+#: src/gui/setup_video.cpp:199
 msgid "Fast OpenGL"
 msgstr "快速的OpenGL"
 
-#: src/gui/setup_video.cpp:202
+#: src/gui/setup_video.cpp:200
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:233
+#: src/gui/setup_video.cpp:231
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:234
+#: src/gui/setup_video.cpp:232
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:236
+#: src/gui/setup_video.cpp:234
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:237
+#: src/gui/setup_video.cpp:235
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:238
+#: src/gui/setup_video.cpp:236
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:242 src/gui/setup_video.cpp:268
-#: src/gui/setup_video.cpp:439 src/gui/setup_video.cpp:546
+#: src/gui/setup_video.cpp:240 src/gui/setup_video.cpp:263
+#: src/gui/setup_video.cpp:432 src/gui/setup_video.cpp:539
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:244
+#: src/gui/setup_video.cpp:241
 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
+#: src/gui/setup_video.cpp:261 src/gui/setup_video.cpp:264
+#: src/gui/setup_video.cpp:431 src/gui/setup_video.cpp:525
+#: src/gui/setup_video.cpp:537
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:371
+#: src/gui/setup_video.cpp:364
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:377
+#: src/gui/setup_video.cpp:370
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:388
+#: src/gui/setup_video.cpp:381
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:389
+#: src/gui/setup_video.cpp:382
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:401
+#: src/gui/setup_video.cpp:394
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:402
+#: src/gui/setup_video.cpp:395
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:477
+#: src/gui/setup_video.cpp:470
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:478
+#: src/gui/setup_video.cpp:471
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:495 src/gui/setup_video.cpp:502
+#: src/gui/setup_video.cpp:488 src/gui/setup_video.cpp:495
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:497
+#: src/gui/setup_video.cpp:490
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3469,31 +3473,31 @@ msgstr ""
 msgid "Personal Shop"
 msgstr "个人商店"
 
-#: src/gui/shopwindow.cpp:119
+#: src/gui/shopwindow.cpp:121
 msgid "Buy items"
 msgstr "购买物品"
 
-#: src/gui/shopwindow.cpp:120
+#: src/gui/shopwindow.cpp:122
 msgid "Sell items"
 msgstr "出售物品"
 
-#: src/gui/shopwindow.cpp:124 src/gui/shopwindow.cpp:127
+#: src/gui/shopwindow.cpp:126 src/gui/shopwindow.cpp:129
 msgid "Announce"
 msgstr "公布"
 
-#: src/gui/shopwindow.cpp:128
+#: src/gui/shopwindow.cpp:130
 msgid "Show links in announce"
 msgstr "显示在公布的联系"
 
-#: src/gui/shopwindow.cpp:149 src/gui/shopwindow.cpp:150
+#: src/gui/shopwindow.cpp:151 src/gui/shopwindow.cpp:152
 msgid "Auction"
 msgstr "拍卖"
 
-#: src/gui/shopwindow.cpp:765 src/net/ea/tradehandler.cpp:104
+#: src/gui/shopwindow.cpp:767 src/net/ea/tradehandler.cpp:104
 msgid "Request for Trade"
 msgstr "请求交易"
 
-#: src/gui/shopwindow.cpp:766
+#: src/gui/shopwindow.cpp:768
 #, c-format
 msgid "%s wants to %s %s do you accept?"
 msgstr "%s想要%s %s 你接受吗？"
@@ -3544,219 +3548,219 @@ msgstr "等级: %d"
 msgid "Lvl: %d (%+d)"
 msgstr "等级: %d（%+d）"
 
-#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:244
+#: src/gui/socialwindow.cpp:146 src/gui/socialwindow.cpp:245
 #: src/gui/widgets/guildchattab.cpp:44 src/net/ea/gui/guildtab.cpp:53
 msgid "Guild"
 msgstr "帮会"
 
-#: src/gui/socialwindow.cpp:175
+#: src/gui/socialwindow.cpp:176
 #, c-format
 msgid "Invited user %s to guild %s."
 msgstr "邀请用户%s加入公会%s"
 
-#: src/gui/socialwindow.cpp:189
+#: src/gui/socialwindow.cpp:190
 #, c-format
 msgid "Guild %s quit requested."
 msgstr "退出公会%s的请求。"
 
-#: src/gui/socialwindow.cpp:216
+#: src/gui/socialwindow.cpp:217
 msgid "Member Invite to Guild"
 msgstr "会员邀请到公会"
 
-#: src/gui/socialwindow.cpp:217
+#: src/gui/socialwindow.cpp:218
 #, c-format
 msgid "Who would you like to invite to guild %s?"
 msgstr "你要邀请谁加入工会%s?"
 
-#: src/gui/socialwindow.cpp:226
+#: src/gui/socialwindow.cpp:227
 msgid "Leave Guild?"
 msgstr "离开公会？"
 
-#: src/gui/socialwindow.cpp:227
+#: src/gui/socialwindow.cpp:228
 #, c-format
 msgid "Are you sure you want to leave guild %s?"
 msgstr "你确定要离开工会%s吗？"
 
-#: src/gui/socialwindow.cpp:298 src/net/ea/gui/partytab.cpp:51
+#: src/gui/socialwindow.cpp:300 src/net/ea/gui/partytab.cpp:51
 msgid "Party"
 msgstr "t"
 
-#: src/gui/socialwindow.cpp:326
+#: src/gui/socialwindow.cpp:329
 #, c-format
 msgid "Invited user %s to party."
 msgstr "邀请用户%s加入团队."
 
-#: src/gui/socialwindow.cpp:340
+#: src/gui/socialwindow.cpp:343
 #, c-format
 msgid "Party %s quit requested."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:367
+#: src/gui/socialwindow.cpp:370
 msgid "Member Invite to Party"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:368
+#: src/gui/socialwindow.cpp:371
 #, c-format
 msgid "Who would you like to invite to party %s?"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:377
+#: src/gui/socialwindow.cpp:380
 msgid "Leave Party?"
 msgstr "离开团队?"
 
-#: src/gui/socialwindow.cpp:378
+#: src/gui/socialwindow.cpp:381
 #, c-format
 msgid "Are you sure you want to leave party %s?"
 msgstr ""
 
 #. TRANSLATORS: Navigation tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:598
+#: src/gui/socialwindow.cpp:603
 msgid "Nav"
 msgstr ""
 
 #. TRANSLATORS: Attack filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:930
+#: src/gui/socialwindow.cpp:936
 msgid "Atk"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:954
+#: src/gui/socialwindow.cpp:960
 msgid "Priority mobs"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:955
+#: src/gui/socialwindow.cpp:961
 msgid "Attack mobs"
 msgstr "攻击暴徒"
 
-#: src/gui/socialwindow.cpp:956
+#: src/gui/socialwindow.cpp:962
 msgid "Ignore mobs"
 msgstr ""
 
 #. TRANSLATORS: Pickup filter tab name in social window. Should be small
-#: src/gui/socialwindow.cpp:984
+#: src/gui/socialwindow.cpp:991
 msgid "Pik"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1008
+#: src/gui/socialwindow.cpp:1015
 msgid "Pickup items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1009
+#: src/gui/socialwindow.cpp:1016
 msgid "Ignore items"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1132
+#: src/gui/socialwindow.cpp:1140
 msgid "Create Guild"
 msgstr "创建帮会"
 
-#: src/gui/socialwindow.cpp:1133 src/gui/socialwindow.cpp:1585
+#: src/gui/socialwindow.cpp:1141 src/gui/socialwindow.cpp:1593
 msgid "Create Party"
 msgstr "建立"
 
-#: src/gui/socialwindow.cpp:1175 src/gui/windowmenu.cpp:102
+#: src/gui/socialwindow.cpp:1183 src/gui/windowmenu.cpp:102
 msgid "Social"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1198
+#: src/gui/socialwindow.cpp:1206
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANSLATORS: here P is title for visible players tab in social window
-#: src/gui/socialwindow.cpp:1214
+#: src/gui/socialwindow.cpp:1222
 msgid "P"
 msgstr ""
 
 #. TRANSLATORS: here F is title for friends tab in social window
-#: src/gui/socialwindow.cpp:1219
+#: src/gui/socialwindow.cpp:1227
 msgid "F"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1368
+#: src/gui/socialwindow.cpp:1376
 #, c-format
 msgid "Accepted party invite from %s."
 msgstr "接受%s团队的邀请."
 
-#: src/gui/socialwindow.cpp:1378
+#: src/gui/socialwindow.cpp:1386
 #, c-format
 msgid "Rejected party invite from %s."
 msgstr "拒绝%s的团队邀请."
 
-#: src/gui/socialwindow.cpp:1395
+#: src/gui/socialwindow.cpp:1403
 #, c-format
 msgid "Accepted guild invite from %s."
 msgstr "已接受公会邀请来自%s."
 
-#: src/gui/socialwindow.cpp:1408
+#: src/gui/socialwindow.cpp:1416
 #, c-format
 msgid "Rejected guild invite from %s."
 msgstr "拒绝%s的公会邀请."
 
-#: src/gui/socialwindow.cpp:1455
+#: src/gui/socialwindow.cpp:1463
 #, c-format
 msgid "Creating guild called %s."
 msgstr "创建公会的名为%s"
 
-#: src/gui/socialwindow.cpp:1478
+#: src/gui/socialwindow.cpp:1486
 #, c-format
 msgid "Creating party called %s."
 msgstr "创建团队名字为%s的"
 
-#: src/gui/socialwindow.cpp:1492
+#: src/gui/socialwindow.cpp:1500
 msgid "Guild Name"
 msgstr "公会名称"
 
-#: src/gui/socialwindow.cpp:1493
+#: src/gui/socialwindow.cpp:1501
 msgid "Choose your guild's name."
 msgstr "选择你的公会的名字."
 
-#: src/gui/socialwindow.cpp:1507
+#: src/gui/socialwindow.cpp:1515
 msgid "Received guild request, but one already exists."
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1513
+#: src/gui/socialwindow.cpp:1521
 #, c-format
 msgid "%s has invited you to join the guild %s."
 msgstr "%s邀请你加入公会%s"
 
-#: src/gui/socialwindow.cpp:1519
+#: src/gui/socialwindow.cpp:1527
 msgid "Accept Guild Invite"
 msgstr "接受邀请"
 
-#: src/gui/socialwindow.cpp:1534
+#: src/gui/socialwindow.cpp:1542
 msgid "Received party request, but one already exists."
 msgstr "接受到一个已经存在的帮会邀请。"
 
-#: src/gui/socialwindow.cpp:1545
+#: src/gui/socialwindow.cpp:1553
 msgid "You have been invited you to join a party."
 msgstr "您已被邀请您加入党。"
 
-#: src/gui/socialwindow.cpp:1549
+#: src/gui/socialwindow.cpp:1557
 #, c-format
 msgid "You have been invited to join the %s party."
 msgstr "您已被邀请加入%s的团队。"
 
-#: src/gui/socialwindow.cpp:1557
+#: src/gui/socialwindow.cpp:1565
 #, c-format
 msgid "%s has invited you to join their party."
 msgstr "%s已经邀请你加入他们的帮会。"
 
-#: src/gui/socialwindow.cpp:1562
+#: src/gui/socialwindow.cpp:1570
 #, c-format
 msgid "%s has invited you to join the %s party."
 msgstr "%s已经邀请你加入帮会%s。"
 
-#: src/gui/socialwindow.cpp:1571
+#: src/gui/socialwindow.cpp:1579
 msgid "Accept Party Invite"
 msgstr "接受帮会邀请"
 
-#: src/gui/socialwindow.cpp:1586
+#: src/gui/socialwindow.cpp:1594
 msgid "Cannot create party. You are already in a party"
 msgstr "无法建立团队.您已经在一个队伍中了"
 
-#: src/gui/socialwindow.cpp:1591
+#: src/gui/socialwindow.cpp:1599
 msgid "Party Name"
 msgstr ""
 
-#: src/gui/socialwindow.cpp:1592
+#: src/gui/socialwindow.cpp:1600
 msgid "Choose your party's name."
 msgstr "选择n的名称。"
 
@@ -3909,24 +3913,24 @@ msgstr "已同意。等待中……"
 msgid "Trade: You"
 msgstr "交易：你"
 
-#: src/gui/tradewindow.cpp:113 src/gui/tradewindow.cpp:169
+#: src/gui/tradewindow.cpp:115 src/gui/tradewindow.cpp:171
 #, c-format
 msgid "You get %s"
 msgstr "你得到%s"
 
-#: src/gui/tradewindow.cpp:114
+#: src/gui/tradewindow.cpp:116
 msgid "You give:"
 msgstr "你给予："
 
-#: src/gui/tradewindow.cpp:118
+#: src/gui/tradewindow.cpp:120
 msgid "Change"
 msgstr "改变"
 
-#: src/gui/tradewindow.cpp:377
+#: src/gui/tradewindow.cpp:379
 msgid "You don't have enough money."
 msgstr "你没有足够的钱币."
 
-#: src/gui/tradewindow.cpp:456
+#: src/gui/tradewindow.cpp:458
 msgid "Failed adding item. You can not overlap one kind of item on the window."
 msgstr "添加物品失败。你不能覆盖窗口中的该类物品。"
 
@@ -4117,7 +4121,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:624
 msgid "Who Is Online - Updating"
 msgstr "谁在线 - 更新"
 
@@ -4129,11 +4133,11 @@ msgstr "更新"
 msgid "Who Is Online - "
 msgstr "谁在线 -"
 
-#: src/gui/whoisonline.cpp:631
+#: src/gui/whoisonline.cpp:638
 msgid "Who Is Online - error"
 msgstr "谁在线 - 错误"
 
-#: src/gui/whoisonline.cpp:671
+#: src/gui/whoisonline.cpp:678
 msgid "Who Is Online - Update"
 msgstr "谁在线 - 更新"
 
@@ -5717,15 +5721,15 @@ msgstr "攻击范围"
 msgid "Damage per sec."
 msgstr "每秒伤害"
 
-#: src/net/eathena/network.cpp:175 src/net/tmwa/network.cpp:153
+#: src/net/eathena/network.cpp:176 src/net/tmwa/network.cpp:154
 msgid "Empty address given to Network::connect()!"
 msgstr "空的地址给网络：连接（）！"
 
-#: src/net/eathena/network.cpp:387 src/net/tmwa/network.cpp:365
+#: src/net/eathena/network.cpp:388 src/net/tmwa/network.cpp:366
 msgid "Unable to resolve host \""
 msgstr "无法解析主机“"
 
-#: src/net/eathena/network.cpp:457 src/net/tmwa/network.cpp:435
+#: src/net/eathena/network.cpp:465 src/net/tmwa/network.cpp:443
 msgid "Connection to server terminated. "
 msgstr "连接到服务器终止。"