1 files changed, 118 insertions, 114 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 54cab571d..8667eb955 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-12-02 01:31+0300\n"
+"POT-Creation-Date: 2012-12-08 15:54+0300\n"
 "PO-Revision-Date: 2012-12-01 22:32+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/manaplus/"
@@ -56,54 +56,54 @@ msgstr "A"
 msgid "I"
 msgstr "I"
 
-#: src/client.cpp:1074 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:169
+#: src/client.cpp:1079 src/gui/setup.cpp:53 src/gui/windowmenu.cpp:169
 msgid "Setup"
 msgstr "设置"
 
-#: src/client.cpp:1077 src/gui/setup_perfomance.cpp:47
+#: src/client.cpp:1082 src/gui/setup_perfomance.cpp:47
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:1079 src/gui/setup_video.cpp:243
+#: src/client.cpp:1084 src/gui/setup_video.cpp:243
 msgid "Video"
 msgstr "视频"
 
-#: src/client.cpp:1081
+#: src/client.cpp:1086
 msgid "Themes"
 msgstr "主题"
 
-#: src/client.cpp:1084 src/gui/didyouknowwindow.cpp:71
+#: src/client.cpp:1089 src/gui/didyouknowwindow.cpp:71
 #: src/gui/helpwindow.cpp:64 src/gui/inventorywindow.cpp:208
 #: src/gui/npcdialog.cpp:58 src/gui/npcdialog.cpp:82 src/gui/popupmenu.cpp:501
 #: src/gui/questswindow.cpp:105 src/gui/shopwindow.cpp:78
 msgid "Close"
 msgstr "关闭"
 
-#: src/client.cpp:1174
+#: src/client.cpp:1179
 msgid "Connecting to server"
 msgstr "正在连接服务器"
 
-#: src/client.cpp:1216
+#: src/client.cpp:1221
 msgid "Logging in"
 msgstr "登录中"
 
-#: src/client.cpp:1254
+#: src/client.cpp:1259
 msgid "Entering game world"
 msgstr "进入游戏世界"
 
-#: src/client.cpp:1367
+#: src/client.cpp:1372
 msgid "Requesting characters"
 msgstr "请求角色"
 
-#: src/client.cpp:1405
+#: src/client.cpp:1410
 msgid "Connecting to the game server"
 msgstr "正在连接游戏服务器"
 
-#: src/client.cpp:1417
+#: src/client.cpp:1422
 msgid "Changing game servers"
 msgstr "正在更改游戏服务器"
 
-#: src/client.cpp:1473 src/client.cpp:1483 src/client.cpp:1642
+#: src/client.cpp:1478 src/client.cpp:1488 src/client.cpp:1647
 #: src/gui/changeemaildialog.cpp:159 src/gui/changepassworddialog.cpp:147
 #: src/gui/charcreatedialog.cpp:293 src/gui/charselectdialog.cpp:273
 #: src/gui/editserverdialog.cpp:204 src/gui/registerdialog.cpp:245
@@ -112,50 +112,50 @@ msgstr "正在更改游戏服务器"
 msgid "Error"
 msgstr "错误"
 
-#: src/client.cpp:1495
+#: src/client.cpp:1500
 msgid "Requesting registration details"
 msgstr "正在请求详细注册信息"
 
-#: src/client.cpp:1531
+#: src/client.cpp:1536
 msgid "Password Change"
 msgstr "更改密码"
 
-#: src/client.cpp:1532
+#: src/client.cpp:1537
 msgid "Password changed successfully!"
 msgstr "密码更改成功！"
 
-#: src/client.cpp:1552
+#: src/client.cpp:1557
 msgid "Email Change"
 msgstr "更改电子邮箱地址"
 
-#: src/client.cpp:1553
+#: src/client.cpp:1558
 msgid "Email changed successfully!"
 msgstr "电子邮箱地址更改成功！"
 
-#: src/client.cpp:1573
+#: src/client.cpp:1578
 msgid "Unregister Successful"
 msgstr "取消注册成功"
 
-#: src/client.cpp:1574
+#: src/client.cpp:1579
 msgid "Farewell, come back any time..."
 msgstr "再见，欢迎随时回来... ..."
 
-#: src/client.cpp:1821 src/client.cpp:1835 src/client.cpp:1871
-#: src/client.cpp:1886 src/client.cpp:2346 src/client.cpp:2353
+#: src/client.cpp:1826 src/client.cpp:1840 src/client.cpp:1876
+#: src/client.cpp:1891 src/client.cpp:2351 src/client.cpp:2358
 #, c-format
 msgid "%s doesn't exist and can't be created! Exiting."
 msgstr "%s 不存在，且无法创建！正在退出。"
 
-#: src/client.cpp:2035
+#: src/client.cpp:2040
 #, c-format
 msgid "Invalid update host: %s"
 msgstr "主机更新无效：%s"
 
-#: src/client.cpp:2074 src/client.cpp:2080
+#: src/client.cpp:2079 src/client.cpp:2085
 msgid "Error creating updates directory!"
 msgstr "创建更新目录错误！"
 
-#: src/client.cpp:2101 src/client.cpp:2113
+#: src/client.cpp:2106 src/client.cpp:2118
 #, c-format
 msgid "Error: %s doesn't exist and can't be created! Exiting."
 msgstr "错误：%s 不存在且无法创建！正在退出。"
@@ -458,7 +458,7 @@ msgid "Max"
 msgstr "最大"
 
 #: src/gui/buyselldialog.cpp:38 src/gui/buyselldialog.cpp:48
-#: src/gui/inventorywindow.cpp:183 src/gui/setup_other.cpp:150
+#: src/gui/inventorywindow.cpp:183 src/gui/setup_other.cpp:151
 #: src/gui/windowmenu.cpp:155
 msgid "Shop"
 msgstr "商店"
@@ -595,8 +595,8 @@ msgstr "美女"
 
 #: src/gui/charcreatedialog.cpp:91 src/gui/registerdialog.cpp:104
 #: src/gui/setupactiondata.h:1485 src/gui/setupactiondata.h:1558
-#: src/gui/setup_audio.cpp:128 src/gui/setup_chat.cpp:128
-#: src/gui/setup_other.cpp:213 src/gui/setup_visual.cpp:100
+#: src/gui/setup_audio.cpp:128 src/gui/setup_chat.cpp:131
+#: src/gui/setup_other.cpp:214 src/gui/setup_visual.cpp:100
 msgid "Other"
 msgstr "其他"
 
@@ -684,64 +684,64 @@ msgstr "等级 %d"
 msgid "(empty)"
 msgstr "()"
 
-#: src/gui/chatwindow.cpp:118 src/gui/inventorywindow.cpp:63
+#: src/gui/chatwindow.cpp:138 src/gui/inventorywindow.cpp:63
 #: src/gui/setup_visual.cpp:105
 msgid "default"
 msgstr "默认"
 
-#: src/gui/chatwindow.cpp:119
+#: src/gui/chatwindow.cpp:139
 msgid "black"
 msgstr "黑色"
 
-#: src/gui/chatwindow.cpp:120
+#: src/gui/chatwindow.cpp:140
 msgid "red"
 msgstr "红色"
 
-#: src/gui/chatwindow.cpp:121
+#: src/gui/chatwindow.cpp:141
 msgid "green"
 msgstr "绿色"
 
-#: src/gui/chatwindow.cpp:122
+#: src/gui/chatwindow.cpp:142
 msgid "blue"
 msgstr "蓝色"
 
-#: src/gui/chatwindow.cpp:123
+#: src/gui/chatwindow.cpp:143
 msgid "gold"
 msgstr "金"
 
-#: src/gui/chatwindow.cpp:124
+#: src/gui/chatwindow.cpp:144
 msgid "yellow"
 msgstr "黄色"
 
-#: src/gui/chatwindow.cpp:125
+#: src/gui/chatwindow.cpp:145
 msgid "pink"
 msgstr "粉红色"
 
-#: src/gui/chatwindow.cpp:126
+#: src/gui/chatwindow.cpp:146
 msgid "purple"
 msgstr "紫"
 
-#: src/gui/chatwindow.cpp:127
+#: src/gui/chatwindow.cpp:147
 msgid "grey"
 msgstr "灰色"
 
-#: src/gui/chatwindow.cpp:128
+#: src/gui/chatwindow.cpp:148
 msgid "brown"
 msgstr "棕色"
 
-#: src/gui/chatwindow.cpp:129
+#: src/gui/chatwindow.cpp:149
 msgid "rainbow 1"
 msgstr "彩虹1"
 
-#: src/gui/chatwindow.cpp:130
+#: src/gui/chatwindow.cpp:150
 msgid "rainbow 2"
 msgstr "彩虹2"
 
-#: src/gui/chatwindow.cpp:131
+#: src/gui/chatwindow.cpp:151
 msgid "rainbow 3"
 msgstr "彩虹3"
 
-#: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:83
+#: src/gui/chatwindow.cpp:169 src/gui/inventorywindow.cpp:83
 #: src/gui/itemamountwindow.cpp:94 src/gui/logindialog.cpp:79
 #: src/gui/logindialog.cpp:109 src/gui/setup_relations.cpp:227
 #: src/gui/setup_theme.cpp:109 src/gui/setup_theme.cpp:155
@@ -751,17 +751,17 @@ msgstr "彩虹3"
 msgid "???"
 msgstr "？？？"
 
-#: src/gui/chatwindow.cpp:158 src/gui/setupactiondata.h:1557
+#: src/gui/chatwindow.cpp:178 src/gui/setupactiondata.h:1557
 #: src/gui/setup_chat.cpp:47 src/gui/windowmenu.cpp:102
 msgid "Chat"
 msgstr "聊天"
 
-#: src/gui/chatwindow.cpp:676
+#: src/gui/chatwindow.cpp:697
 #, c-format
 msgid "Present: %s; %d players are present."
 msgstr ""
 
-#: src/gui/chatwindow.cpp:1092
+#: src/gui/chatwindow.cpp:1113
 #, c-format
 msgid "Whispering to %s: %s"
 msgstr "对%s密语到：%s"
@@ -1333,7 +1333,7 @@ msgid "Submit"
 msgstr "提交"
 
 #: src/gui/npcdialog.cpp:64 src/gui/npcpostdialog.cpp:42
-#: src/gui/setup_other.cpp:159
+#: src/gui/setup_other.cpp:160
 msgid "NPC"
 msgstr "NPC"
 
@@ -2345,7 +2345,7 @@ msgstr ""
 msgid "Shortcuts"
 msgstr "快捷键"
 
-#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:187
+#: src/gui/setupactiondata.h:1554 src/gui/setup_other.cpp:188
 msgid "Windows"
 msgstr ""
 
@@ -2477,103 +2477,107 @@ msgstr ""
 msgid "Auto hide chat window."
 msgstr ""
 
-#: src/gui/setup_chat.cpp:60 src/gui/setup_colors.cpp:79
+#: src/gui/setup_chat.cpp:59
+msgid "Protect chat focus."
+msgstr ""
+
+#: src/gui/setup_chat.cpp:63 src/gui/setup_colors.cpp:79
 msgid "Colors"
 msgstr "颜色"
 
-#: src/gui/setup_chat.cpp:62
+#: src/gui/setup_chat.cpp:65
 msgid "Remove colors from received chat messages"
 msgstr "从收到的聊天消息中删除颜色"
 
-#: src/gui/setup_chat.cpp:65
+#: src/gui/setup_chat.cpp:68
 msgid "Show chat colors list"
 msgstr "显示聊天颜色列表"
 
-#: src/gui/setup_chat.cpp:69
+#: src/gui/setup_chat.cpp:72
 msgid "Commands"
 msgstr "命令"
 
-#: src/gui/setup_chat.cpp:71
+#: src/gui/setup_chat.cpp:74
 msgid "Allow magic and GM commands in all chat tabs"
 msgstr "允许在所有聊天标签中使用魔法和GM命令"
 
-#: src/gui/setup_chat.cpp:75
+#: src/gui/setup_chat.cpp:78
 msgid "Limits"
 msgstr "限制"
 
-#: src/gui/setup_chat.cpp:77
+#: src/gui/setup_chat.cpp:80
 msgid "Limit max chars in chat line"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:80
+#: src/gui/setup_chat.cpp:83
 msgid "Limit max lines in chat"
 msgstr "限制聊天的最大"
 
-#: src/gui/setup_chat.cpp:84
+#: src/gui/setup_chat.cpp:87
 msgid "Logs"
 msgstr "日志"
 
-#: src/gui/setup_chat.cpp:86
+#: src/gui/setup_chat.cpp:89
 msgid "Enable chat Log"
 msgstr "启用聊天记录"
 
-#: src/gui/setup_chat.cpp:89
+#: src/gui/setup_chat.cpp:92
 msgid "Show chat history"
 msgstr "显示聊天记录"
 
-#: src/gui/setup_chat.cpp:93
+#: src/gui/setup_chat.cpp:96
 msgid "Messages"
 msgstr "消息"
 
-#: src/gui/setup_chat.cpp:95
+#: src/gui/setup_chat.cpp:98
 msgid "Hide shop messages"
 msgstr "隐藏商店消息"
 
-#: src/gui/setup_chat.cpp:99
+#: src/gui/setup_chat.cpp:102
 msgid "Tabs"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:101
+#: src/gui/setup_chat.cpp:104
 msgid "Put all whispers in tabs"
 msgstr "将所有密语放于标签夜"
 
-#: src/gui/setup_chat.cpp:104
+#: src/gui/setup_chat.cpp:107
 msgid "Log magic messages in debug tab"
 msgstr "在调试页记录魔法信息"
 
-#: src/gui/setup_chat.cpp:107
+#: src/gui/setup_chat.cpp:110
 msgid "Show server messages in debug tab"
 msgstr "在调试选项卡中显示服务器的消息"
 
-#: src/gui/setup_chat.cpp:110
+#: src/gui/setup_chat.cpp:113
 msgid "Enable trade tab"
 msgstr "标签"
 
-#: src/gui/setup_chat.cpp:113
+#: src/gui/setup_chat.cpp:116
 msgid "Enable battle tab"
 msgstr "启用战斗“选项卡"
 
-#: src/gui/setup_chat.cpp:116
+#: src/gui/setup_chat.cpp:119
 msgid "Show battle events"
 msgstr "显示的战斗事件"
 
-#: src/gui/setup_chat.cpp:119
+#: src/gui/setup_chat.cpp:122
 msgid "Resize chat tabs if need"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:123
+#: src/gui/setup_chat.cpp:126
 msgid "Time"
 msgstr "时间"
 
-#: src/gui/setup_chat.cpp:125
+#: src/gui/setup_chat.cpp:128
 msgid "Use local time"
 msgstr "使用本地时间"
 
-#: src/gui/setup_chat.cpp:130
+#: src/gui/setup_chat.cpp:133
 msgid "Highlight words (separated by comma)"
 msgstr ""
 
-#: src/gui/setup_chat.cpp:133
+#: src/gui/setup_chat.cpp:136
 msgid "Show MVP messages"
 msgstr ""
 
@@ -2791,167 +2795,167 @@ msgstr "疯狂的举动的程序"
 msgid "Mouse relative moves (good for touch interfaces)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:117
+#: src/gui/setup_other.cpp:118
 msgid "Player"
 msgstr "玩家"
 
-#: src/gui/setup_other.cpp:119
+#: src/gui/setup_other.cpp:120
 msgid "Show own hp bar"
 msgstr "显示自己的HP栏"
 
-#: src/gui/setup_other.cpp:122
+#: src/gui/setup_other.cpp:123
 msgid "Enable quick stats"
 msgstr "启用快速统计"
 
-#: src/gui/setup_other.cpp:125
+#: src/gui/setup_other.cpp:126
 msgid "Cycle player targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:128
+#: src/gui/setup_other.cpp:129
 msgid "Show job exp messages"
 msgstr "显示工作EXP消息"
 
-#: src/gui/setup_other.cpp:131
+#: src/gui/setup_other.cpp:132
 msgid "Show players popups"
 msgstr "显示球员弹出窗口"
 
-#: src/gui/setup_other.cpp:134
+#: src/gui/setup_other.cpp:135
 msgid "Afk message"
 msgstr ""
 
-#: src/gui/setup_other.cpp:137
+#: src/gui/setup_other.cpp:138
 msgid "Show job"
 msgstr "显示工作"
 
-#: src/gui/setup_other.cpp:140
+#: src/gui/setup_other.cpp:141
 msgid "Enable attack filter"
 msgstr "启用攻击过滤器"
 
-#: src/gui/setup_other.cpp:143
+#: src/gui/setup_other.cpp:144
 msgid "Enable pickup filter"
 msgstr ""
 
-#: src/gui/setup_other.cpp:146
+#: src/gui/setup_other.cpp:147
 msgid "Enable advert protocol"
 msgstr ""
 
-#: src/gui/setup_other.cpp:152
+#: src/gui/setup_other.cpp:153
 msgid "Accept sell/buy requests"
 msgstr "接受出售/购买请求"
 
-#: src/gui/setup_other.cpp:155
+#: src/gui/setup_other.cpp:156
 msgid "Enable shop mode"
 msgstr "启用商店模式"
 
-#: src/gui/setup_other.cpp:161
+#: src/gui/setup_other.cpp:162
 msgid "Cycle npc targets"
 msgstr ""
 
-#: src/gui/setup_other.cpp:164
+#: src/gui/setup_other.cpp:165
 msgid "Log NPC dialogue"
 msgstr "NPC对话"
 
-#: src/gui/setup_other.cpp:168
+#: src/gui/setup_other.cpp:169
 msgid "Bots support"
 msgstr "挂机支持"
 
-#: src/gui/setup_other.cpp:170
+#: src/gui/setup_other.cpp:171
 msgid "Enable auction bot support"
 msgstr "启用拍卖挂机支持"
 
-#: src/gui/setup_other.cpp:173
+#: src/gui/setup_other.cpp:174
 msgid "Enable guild bot support and disable native guild support"
 msgstr ""
 
-#: src/gui/setup_other.cpp:178
+#: src/gui/setup_other.cpp:179
 msgid "Keyboard"
 msgstr ""
 
-#: src/gui/setup_other.cpp:180
+#: src/gui/setup_other.cpp:181
 msgid "Repeat delay"
 msgstr ""
 
-#: src/gui/setup_other.cpp:183
+#: src/gui/setup_other.cpp:184
 msgid "Repeat interval"
 msgstr ""
 
-#: src/gui/setup_other.cpp:189
+#: src/gui/setup_other.cpp:190
 msgid "Always show"
 msgstr ""
 
-#: src/gui/setup_other.cpp:190
+#: src/gui/setup_other.cpp:191
 msgid "Auto hide in small resolution"
 msgstr ""
 
-#: src/gui/setup_other.cpp:191
+#: src/gui/setup_other.cpp:192
 msgid "Always auto hide"
 msgstr ""
 
-#: src/gui/setup_other.cpp:192
+#: src/gui/setup_other.cpp:193
 msgid "Shortcut buttons"
 msgstr ""
 
-#: src/gui/setup_other.cpp:196
+#: src/gui/setup_other.cpp:197
 msgid "Proxy server"
 msgstr ""
 
-#: src/gui/setup_other.cpp:198
+#: src/gui/setup_other.cpp:199
 msgid "System proxy"
 msgstr ""
 
-#: src/gui/setup_other.cpp:199
+#: src/gui/setup_other.cpp:200
 msgid "Direct connection"
 msgstr ""
 
-#: src/gui/setup_other.cpp:205
+#: src/gui/setup_other.cpp:206
 msgid "SOCKS5 hostname"
 msgstr ""
 
-#: src/gui/setup_other.cpp:206
+#: src/gui/setup_other.cpp:207
 msgid "Proxy type"
 msgstr ""
 
-#: src/gui/setup_other.cpp:209
+#: src/gui/setup_other.cpp:210
 msgid "Proxy address:port"
 msgstr ""
 
-#: src/gui/setup_other.cpp:215
+#: src/gui/setup_other.cpp:216
 msgid "Enable server side attack"
 msgstr "启用服务器端的攻击"
 
-#: src/gui/setup_other.cpp:218
+#: src/gui/setup_other.cpp:219
 msgid "Enable bot checker"
 msgstr "启用挂机检查"
 
-#: src/gui/setup_other.cpp:221
+#: src/gui/setup_other.cpp:222
 msgid "Enable buggy servers protection (do not disable)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:225
+#: src/gui/setup_other.cpp:226
 msgid "Enable debug log"
 msgstr "启用调试日志"
 
-#: src/gui/setup_other.cpp:228
+#: src/gui/setup_other.cpp:229
 msgid "Enable OpenGL log"
 msgstr ""
 
-#: src/gui/setup_other.cpp:231
+#: src/gui/setup_other.cpp:232
 msgid "Low traffic mode"
 msgstr "低流量模式"
 
-#: src/gui/setup_other.cpp:234
+#: src/gui/setup_other.cpp:235
 msgid "Hide shield sprite"
 msgstr ""
 
-#: src/gui/setup_other.cpp:237
+#: src/gui/setup_other.cpp:238
 msgid "Use FBO for screenshots (only for opengl)"
 msgstr ""
 
-#: src/gui/setup_other.cpp:240
+#: src/gui/setup_other.cpp:241
 msgid "Network delay between sub servers"
 msgstr ""
 
-#: src/gui/setup_other.cpp:243
+#: src/gui/setup_other.cpp:244
 msgid "Show background"
 msgstr "显示背景"