1 files changed, 75 insertions, 75 deletions
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 62d9e892b..7d63cdcd7 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ManaPlus\n"
 "Report-Msgid-Bugs-To: akaras@inbox.ru\n"
-"POT-Creation-Date: 2012-03-29 01:26+0300\n"
+"POT-Creation-Date: 2012-03-31 19:47+0300\n"
 "PO-Revision-Date: 2012-03-28 22:29+0000\n"
 "Last-Translator: Andrei Karas <akaras@inbox.ru>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/manaplus/"
@@ -29,7 +29,7 @@ msgstr "忽略新进的交易请求"
 msgid "Accepting incoming trade requests"
 msgstr "接受传入的交易请求"
 
-#: src/actorspritemanager.cpp:1164
+#: src/actorspritemanager.cpp:1163
 msgid "Visible on map"
 msgstr "在地图上可见"
 
@@ -63,7 +63,7 @@ msgstr "魔法攻击"
 msgid "Perfomance"
 msgstr "性能"
 
-#: src/client.cpp:981 src/gui/setup_video.cpp:239
+#: src/client.cpp:981 src/gui/setup_video.cpp:237
 msgid "Video"
 msgstr "视频"
 
@@ -382,7 +382,7 @@ msgstr "评论: %s"
 msgid "Bot Checker"
 msgstr "挂机检查"
 
-#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:65
+#: src/gui/botcheckerwindow.cpp:296 src/gui/setup_relations.cpp:62
 msgid "Name"
 msgstr "姓名"
 
@@ -483,7 +483,7 @@ msgstr "出售"
 #: src/gui/popupmenu.cpp:2065 src/gui/popupmenu.cpp:2106
 #: src/gui/popupmenu.cpp:2160 src/gui/popupmenu.cpp:2182
 #: src/gui/quitdialog.cpp:55 src/gui/register.cpp:83 src/gui/setup.cpp:73
-#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:242
+#: src/gui/socialwindow.cpp:1199 src/gui/textcommandeditor.cpp:241
 #: src/gui/textdialog.cpp:51 src/gui/unregisterdialog.cpp:59
 #: src/gui/updaterwindow.cpp:169
 msgid "Cancel"
@@ -663,8 +663,8 @@ msgid "Enter password:"
 msgstr "输入密码："
 
 #: src/gui/charselectdialog.cpp:413 src/gui/serverdialog.cpp:266
-#: src/gui/setup_relations.cpp:249 src/gui/shopwindow.cpp:123
-#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:245
+#: src/gui/setup_relations.cpp:246 src/gui/shopwindow.cpp:123
+#: src/gui/shopwindow.cpp:126 src/gui/textcommandeditor.cpp:244
 msgid "Delete"
 msgstr "删除"
 
@@ -740,10 +740,10 @@ msgstr "彩虹3"
 
 #: src/gui/chatwindow.cpp:149 src/gui/inventorywindow.cpp:90
 #: src/gui/itemamountwindow.cpp:93 src/gui/logindialog.cpp:79
-#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:227
+#: src/gui/logindialog.cpp:107 src/gui/setup_relations.cpp:224
 #: src/gui/setup_theme.cpp:102 src/gui/setup_theme.cpp:148
-#: src/gui/setup_video.cpp:211 src/gui/textcommandeditor.cpp:101
-#: src/gui/textcommandeditor.cpp:141 src/gui/textcommandeditor.cpp:161
+#: src/gui/setup_video.cpp:209 src/gui/textcommandeditor.cpp:100
+#: src/gui/textcommandeditor.cpp:140 src/gui/textcommandeditor.cpp:160
 #: src/gui/widgets/namesmodel.cpp:48
 msgid "???"
 msgstr "？？？"
@@ -1421,7 +1421,7 @@ msgstr ""
 #: src/gui/popupmenu.cpp:184 src/gui/popupmenu.cpp:196
 #: src/gui/popupmenu.cpp:439 src/gui/popupmenu.cpp:459
 #: src/gui/popupmenu.cpp:729 src/gui/popupmenu.cpp:749
-#: src/playerrelations.cpp:466
+#: src/playerrelations.cpp:463
 msgid "Completely ignore"
 msgstr "完全忽略"
 
@@ -2381,55 +2381,55 @@ msgstr ""
 msgid "Group friends in who is online window"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:66
+#: src/gui/setup_relations.cpp:63
 msgid "Relation"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:71
+#: src/gui/setup_relations.cpp:68
 msgid "Neutral"
 msgstr "中立"
 
-#: src/gui/setup_relations.cpp:72
+#: src/gui/setup_relations.cpp:69
 msgid "Friend"
 msgstr "好友"
 
-#: src/gui/setup_relations.cpp:73
+#: src/gui/setup_relations.cpp:70
 msgid "Disregarded"
 msgstr "被忽视的"
 
-#: src/gui/setup_relations.cpp:74
+#: src/gui/setup_relations.cpp:71
 msgid "Ignored"
 msgstr "忽略"
 
-#: src/gui/setup_relations.cpp:75
+#: src/gui/setup_relations.cpp:72
 msgid "Erased"
 msgstr "已删除"
 
-#: src/gui/setup_relations.cpp:76
+#: src/gui/setup_relations.cpp:73
 msgid "Blacklisted"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:77
+#: src/gui/setup_relations.cpp:74
 msgid "Enemy"
 msgstr ""
 
-#: src/gui/setup_relations.cpp:245
+#: src/gui/setup_relations.cpp:242
 msgid "Allow trading"
 msgstr "允许交易"
 
-#: src/gui/setup_relations.cpp:247
+#: src/gui/setup_relations.cpp:244
 msgid "Allow whispers"
 msgstr "允许密语"
 
-#: src/gui/setup_relations.cpp:250
+#: src/gui/setup_relations.cpp:247
 msgid "Old"
 msgstr "旧"
 
-#: src/gui/setup_relations.cpp:252
+#: src/gui/setup_relations.cpp:249
 msgid "Relations"
 msgstr "关系"
 
-#: src/gui/setup_relations.cpp:274
+#: src/gui/setup_relations.cpp:271
 msgid "When ignoring:"
 msgstr "当忽略时："
 
@@ -2557,93 +2557,93 @@ msgstr "字体大小"
 msgid "Theme Changed"
 msgstr "主题更改"
 
-#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:503
-#: src/gui/setup_video.cpp:510
+#: src/gui/setup_theme.cpp:352 src/gui/setup_video.cpp:501
+#: src/gui/setup_video.cpp:508
 msgid "Restart your client for the change to take effect."
 msgstr "重启您的游戏客户端以使变更生效。"
 
-#: src/gui/setup_video.cpp:194
+#: src/gui/setup_video.cpp:192
 msgid "Software"
 msgstr "软件"
 
-#: src/gui/setup_video.cpp:195
+#: src/gui/setup_video.cpp:193
 msgid "Fast OpenGL"
 msgstr "快速的OpenGL"
 
-#: src/gui/setup_video.cpp:196
+#: src/gui/setup_video.cpp:194
 msgid "Safe OpenGL"
 msgstr "安全的OpenGL"
 
-#: src/gui/setup_video.cpp:227
+#: src/gui/setup_video.cpp:225
 msgid "Full screen"
 msgstr "全屏"
 
-#: src/gui/setup_video.cpp:228
+#: src/gui/setup_video.cpp:226
 msgid "Custom cursor"
 msgstr "自定义鼠标"
 
-#: src/gui/setup_video.cpp:230
+#: src/gui/setup_video.cpp:228
 msgid "Enable resize"
 msgstr ""
 
-#: src/gui/setup_video.cpp:231
+#: src/gui/setup_video.cpp:229
 msgid "No frame"
 msgstr ""
 
-#: src/gui/setup_video.cpp:232
+#: src/gui/setup_video.cpp:230
 msgid "FPS limit:"
 msgstr "FPS限制："
 
-#: src/gui/setup_video.cpp:236 src/gui/setup_video.cpp:257
-#: src/gui/setup_video.cpp:446 src/gui/setup_video.cpp:553
+#: src/gui/setup_video.cpp:234 src/gui/setup_video.cpp:255
+#: src/gui/setup_video.cpp:444 src/gui/setup_video.cpp:551
 msgid "Alt FPS limit: "
 msgstr ""
 
-#: src/gui/setup_video.cpp:255 src/gui/setup_video.cpp:258
-#: src/gui/setup_video.cpp:445 src/gui/setup_video.cpp:539
-#: src/gui/setup_video.cpp:551
+#: 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
 msgid "None"
 msgstr "w"
 
-#: src/gui/setup_video.cpp:378
+#: src/gui/setup_video.cpp:376
 msgid ""
 "Failed to switch to windowed mode and restoration of old mode also failed!"
 msgstr "切换到窗口模式，并恢复旧的模式，也没有失败！"
 
-#: src/gui/setup_video.cpp:384
+#: src/gui/setup_video.cpp:382
 msgid ""
 "Failed to switch to fullscreen mode and restoration of old mode also failed!"
 msgstr ""
 
-#: src/gui/setup_video.cpp:395
+#: src/gui/setup_video.cpp:393
 msgid "Switching to Full Screen"
 msgstr "切换到全屏"
 
-#: src/gui/setup_video.cpp:396
+#: src/gui/setup_video.cpp:394
 msgid "Restart needed for changes to take effect."
 msgstr "重启生效"
 
-#: src/gui/setup_video.cpp:408
+#: src/gui/setup_video.cpp:406
 msgid "Changing to OpenGL"
 msgstr "切换到OpenGL"
 
-#: src/gui/setup_video.cpp:409
+#: src/gui/setup_video.cpp:407
 msgid "Applying change to OpenGL requires restart."
 msgstr "运用改变为OpenGL需要重新开始"
 
-#: src/gui/setup_video.cpp:484
+#: src/gui/setup_video.cpp:482
 msgid "Custom resolution (example: 1024x768)"
 msgstr "自定义分辨率 (例如: 1024x768)"
 
-#: src/gui/setup_video.cpp:485
+#: src/gui/setup_video.cpp:483
 msgid "Enter new resolution:                "
 msgstr "输入新的分辨率:"
 
-#: src/gui/setup_video.cpp:502 src/gui/setup_video.cpp:509
+#: src/gui/setup_video.cpp:500 src/gui/setup_video.cpp:507
 msgid "Screen Resolution Changed"
 msgstr "屏幕分辨率已更改"
 
-#: src/gui/setup_video.cpp:504
+#: src/gui/setup_video.cpp:502
 msgid "Some windows may be moved to fit the lowered resolution."
 msgstr ""
 
@@ -3072,91 +3072,91 @@ msgstr "级别:%d (GM %d)"
 msgid "Correction points: %d"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:112
+#: src/gui/textcommandeditor.cpp:111
 msgid "No Target"
 msgstr "没有目标"
 
-#: src/gui/textcommandeditor.cpp:113
+#: src/gui/textcommandeditor.cpp:112
 msgid "Allow Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:114
+#: src/gui/textcommandeditor.cpp:113
 msgid "Need Target"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:119
+#: src/gui/textcommandeditor.cpp:118
 msgid "General Magic"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:120
+#: src/gui/textcommandeditor.cpp:119
 msgid "Life Magic"
 msgstr "生活魔术"
 
-#: src/gui/textcommandeditor.cpp:121
+#: src/gui/textcommandeditor.cpp:120
 msgid "War Magic"
 msgstr "战魔"
 
-#: src/gui/textcommandeditor.cpp:122
+#: src/gui/textcommandeditor.cpp:121
 msgid "Transmute Magic"
 msgstr "蜕变魔术"
 
-#: src/gui/textcommandeditor.cpp:123
+#: src/gui/textcommandeditor.cpp:122
 msgid "Nature Magic"
 msgstr "大自然的神奇"
 
-#: src/gui/textcommandeditor.cpp:124
+#: src/gui/textcommandeditor.cpp:123
 msgid "Astral Magic"
 msgstr "星芒魔术"
 
-#: src/gui/textcommandeditor.cpp:169
+#: src/gui/textcommandeditor.cpp:168
 msgid "Command Editor"
 msgstr "命令编辑器"
 
-#: src/gui/textcommandeditor.cpp:186
+#: src/gui/textcommandeditor.cpp:185
 msgid "magic"
 msgstr "魔术"
 
-#: src/gui/textcommandeditor.cpp:190
+#: src/gui/textcommandeditor.cpp:189
 msgid "other"
 msgstr "其他"
 
-#: src/gui/textcommandeditor.cpp:195
+#: src/gui/textcommandeditor.cpp:194
 msgid "Symbol:"
 msgstr "符号："
 
-#: src/gui/textcommandeditor.cpp:198
+#: src/gui/textcommandeditor.cpp:197
 msgid "Command:"
 msgstr "命令："
 
-#: src/gui/textcommandeditor.cpp:201
+#: src/gui/textcommandeditor.cpp:200
 msgid "Comment:"
 msgstr ""
 
-#: src/gui/textcommandeditor.cpp:204
+#: src/gui/textcommandeditor.cpp:203
 msgid "Mana:"
 msgstr "法力："
 
-#: src/gui/textcommandeditor.cpp:210
+#: src/gui/textcommandeditor.cpp:209
 msgid "Target Type:"
 msgstr "目标类型："
 
-#: src/gui/textcommandeditor.cpp:216
+#: src/gui/textcommandeditor.cpp:215
 msgid "Icon:"
 msgstr "图示："
 
-#: src/gui/textcommandeditor.cpp:222
+#: src/gui/textcommandeditor.cpp:221
 msgid "Magic level:"
 msgstr "魔法等级："
 
-#: src/gui/textcommandeditor.cpp:228
+#: src/gui/textcommandeditor.cpp:227
 msgid "Magic School:"
 msgstr "魔法学院："
 
-#: src/gui/textcommandeditor.cpp:234
+#: src/gui/textcommandeditor.cpp:233
 msgid "School level:"
 msgstr "学校层次："
 
-#: src/gui/textcommandeditor.cpp:239
+#: src/gui/textcommandeditor.cpp:238
 msgid "Save"
 msgstr "保存"
 
@@ -5720,19 +5720,19 @@ msgstr "连接到服务器终止。"
 msgid "%s is not in your party!"
 msgstr "%s不在你的帮会中！"
 
-#: src/playerrelations.cpp:480
+#: src/playerrelations.cpp:477
 msgid "Print '...'"
 msgstr ""
 
-#: src/playerrelations.cpp:500
+#: src/playerrelations.cpp:497
 msgid "Blink name"
 msgstr ""
 
-#: src/playerrelations.cpp:542
+#: src/playerrelations.cpp:539
 msgid "Floating '...' bubble"
 msgstr ""
 
-#: src/playerrelations.cpp:545
+#: src/playerrelations.cpp:542
 msgid "Floating bubble"
 msgstr "流动的泡沫"