Updated Simplified Chinese translation.

1 files changed, 86 insertions, 88 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 2b0ef6ec..a85447f1 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13,75 +13,75 @@ msgstr ""
 "Project-Id-Version: gconf HEAD\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gconf&component=general\n"
-"POT-Creation-Date: 2009-03-19 06:10+0000\n"
-"PO-Revision-Date: 2009-03-27 15:27+0800\n"
-"Last-Translator: Ray Wang <wanglei1123@gmail.com>\n"
+"POT-Creation-Date: 2009-09-03 11:57+0000\n"
+"PO-Revision-Date: 2009-09-07 21:59+0800\n"
+"Last-Translator: Hinker <hinkerliu@gmail.com>\n"
 "Language-Team: Chinese/Simplified <i18n-translation@lists.linux.net.cn>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../backends/evoldap-backend.c:159
+#: ../backends/evoldap-backend.c:162
 #, c-format
 msgid "Failed to get configuration file path from '%s'"
 msgstr "从“%s”获得配置文件路径失败"
 
-#: ../backends/evoldap-backend.c:170
+#: ../backends/evoldap-backend.c:173
 #, c-format
 msgid "Created Evolution/LDAP source using configuration file '%s'"
 msgstr "已使用配置文件“%s”创建了 Evolution/LDAP 源"
 
-#: ../backends/evoldap-backend.c:444
+#: ../backends/evoldap-backend.c:447
 #, c-format
 msgid "Unable to parse XML file '%s'"
 msgstr "无法分析 XML 文件“%s”"
 
-#: ../backends/evoldap-backend.c:453
+#: ../backends/evoldap-backend.c:456
 #, c-format
 msgid "Config file '%s' is empty"
 msgstr "配置文件“%s”是空的"
 
-#: ../backends/evoldap-backend.c:464
+#: ../backends/evoldap-backend.c:467
 #, c-format
 msgid "Root node of '%s' must be <evoldap>, not <%s>"
 msgstr "“%s”的根节点必须是 <evoldap>，不是 <%s>"
 
-#: ../backends/evoldap-backend.c:502
+#: ../backends/evoldap-backend.c:505
 #, c-format
 msgid "No <template> specified in '%s'"
 msgstr "“%s”中未指定 <template>"
 
-#: ../backends/evoldap-backend.c:509
+#: ../backends/evoldap-backend.c:512
 #, c-format
 msgid "No \"filter\" attribute specified on <template> in '%s'"
 msgstr "“%s”中的 <template> 未指定“filter”属性"
 
-#: ../backends/evoldap-backend.c:571
+#: ../backends/evoldap-backend.c:574
 #, c-format
 msgid "No LDAP server or base DN specified in '%s'"
 msgstr "“%s”中未指定 LDAP 服务器或基 DN"
 
-#: ../backends/evoldap-backend.c:577
+#: ../backends/evoldap-backend.c:580
 #, c-format
 msgid "Contacting LDAP server: host '%s', port '%d', base DN '%s'"
 msgstr "正连接 LDAP 服务器：主机“%s”，端口“%d”，基 DN“%s”"
 
-#: ../backends/evoldap-backend.c:584
+#: ../backends/evoldap-backend.c:587
 #, c-format
 msgid "Failed to contact LDAP server: %s"
 msgstr "连接 LDAP 服务器失败：%s"
 
-#: ../backends/evoldap-backend.c:672
+#: ../backends/evoldap-backend.c:675
 #, c-format
 msgid "Searching for entries using filter: %s"
 msgstr "使用过滤器搜索项目：%s"
 
-#: ../backends/evoldap-backend.c:686
+#: ../backends/evoldap-backend.c:689
 #, c-format
 msgid "Error querying LDAP server: %s"
 msgstr "查询 LDAP 服务器错误：%s"
 
-#: ../backends/evoldap-backend.c:696
+#: ../backends/evoldap-backend.c:699
 #, c-format
 msgid "Got %d entries using filter: %s"
 msgstr "使用过滤器获得了 %d 项：%s"
@@ -201,151 +201,146 @@ msgstr "载入文件“%s”失败：%s"
 msgid "Line %d character %d: %s"
 msgstr "第 %d 行第 %d 个字符：%s"
 
-#: ../backends/markup-tree.c:2188
-#, c-format
-msgid "Attribute \"%s\" repeated twice on the same <%s> element"
-msgstr "属性“%s”在同一个 <%s> 元素上重复两次"
-
-#: ../backends/markup-tree.c:2205 ../backends/markup-tree.c:2229
+#: ../backends/markup-tree.c:2197 ../backends/markup-tree.c:2218
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "在此上下文中，<%2$s> 元素的属性“%1$s”无效"
 
-#: ../backends/markup-tree.c:2254 ../gconf/gconf-value.c:111
+#: ../backends/markup-tree.c:2243 ../gconf/gconf-value.c:111
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "不理解“%s”(需要整数)"
 
-#: ../backends/markup-tree.c:2261 ../gconf/gconf-value.c:121
+#: ../backends/markup-tree.c:2250 ../gconf/gconf-value.c:121
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "整数“%s”过大或过小"
 
-#: ../backends/markup-tree.c:2293 ../gconf/gconf-value.c:186
+#: ../backends/markup-tree.c:2282 ../gconf/gconf-value.c:186
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "不理解“%s”(需要 true 或 false)"
 
-#: ../backends/markup-tree.c:2317 ../gconf/gconf-value.c:142
+#: ../backends/markup-tree.c:2306 ../gconf/gconf-value.c:142
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "不理解“%s”(需要实数)"
 
-#: ../backends/markup-tree.c:2397
+#: ../backends/markup-tree.c:2386
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "元素 <%3$s> 上的“%2$s”属性设置了未知值“%1$s”"
 
-#: ../backends/markup-tree.c:2417 ../backends/markup-tree.c:2457
-#: ../backends/markup-tree.c:2481 ../backends/markup-tree.c:2489
-#: ../backends/markup-tree.c:2544 ../backends/markup-tree.c:2609
-#: ../backends/markup-tree.c:2721 ../backends/markup-tree.c:2789
-#: ../backends/markup-tree.c:2847 ../backends/markup-tree.c:2997
+#: ../backends/markup-tree.c:2406 ../backends/markup-tree.c:2446
+#: ../backends/markup-tree.c:2470 ../backends/markup-tree.c:2478
+#: ../backends/markup-tree.c:2533 ../backends/markup-tree.c:2598
+#: ../backends/markup-tree.c:2710 ../backends/markup-tree.c:2778
+#: ../backends/markup-tree.c:2836 ../backends/markup-tree.c:2986
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> 元素没有“%1$s”属性"
 
-#: ../backends/markup-tree.c:2431
+#: ../backends/markup-tree.c:2420
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%2$s> 类型“%1$s”未知"
 
-#: ../backends/markup-tree.c:2511
+#: ../backends/markup-tree.c:2500
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%2$s> 上第一元素的类型“%1$s”无效"
 
-#: ../backends/markup-tree.c:2525
+#: ../backends/markup-tree.c:2514
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 cdr_type“%1$s”无效"
 
-#: ../backends/markup-tree.c:2561
+#: ../backends/markup-tree.c:2550
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 list_type“%1$s”无效"
 
-#: ../backends/markup-tree.c:2928
+#: ../backends/markup-tree.c:2917
 msgid "Two <default> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <default> 元素"
 
-#: ../backends/markup-tree.c:2943
+#: ../backends/markup-tree.c:2932
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <longdesc> 元素"
 
-#: ../backends/markup-tree.c:2950
+#: ../backends/markup-tree.c:2939
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "不允许在 <%2$s> 下出现元素 <%1$s>"
 
-#: ../backends/markup-tree.c:2975 ../backends/markup-tree.c:3080
-#: ../backends/markup-tree.c:3134 ../backends/markup-tree.c:3185
+#: ../backends/markup-tree.c:2964 ../backends/markup-tree.c:3069
+#: ../backends/markup-tree.c:3123 ../backends/markup-tree.c:3174
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "提供了 <%s> 但当前元素不拥有类型 %s"
 
-#: ../backends/markup-tree.c:3058
+#: ../backends/markup-tree.c:3047
 msgid "Two <car> elements given for same pair"
 msgstr "同一对给出了两个 <car> 元素"
 
-#: ../backends/markup-tree.c:3072
+#: ../backends/markup-tree.c:3061
 msgid "Two <cdr> elements given for same pair"
 msgstr "同一对给出了两个 <cdr> 元素"
 
-#: ../backends/markup-tree.c:3126
+#: ../backends/markup-tree.c:3115
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> 的类型 %s 错误"
 
-#: ../backends/markup-tree.c:3157
+#: ../backends/markup-tree.c:3146
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "提供了 <%s> 但父 <entry> 没有值"
 
-#: ../backends/markup-tree.c:3198 ../backends/markup-tree.c:3221
-#: ../backends/markup-tree.c:3243 ../backends/markup-tree.c:3260
+#: ../backends/markup-tree.c:3187 ../backends/markup-tree.c:3210
+#: ../backends/markup-tree.c:3232 ../backends/markup-tree.c:3249
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "不允许在当前元素中出现元素 <%s>"
 
-#: ../backends/markup-tree.c:3292
+#: ../backends/markup-tree.c:3281
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "菜单文件中的最里层元素应该是 <gconf> 而非 <%s>"
 
-#: ../backends/markup-tree.c:3312 ../backends/markup-tree.c:3334
-#: ../backends/markup-tree.c:3339
+#: ../backends/markup-tree.c:3301 ../backends/markup-tree.c:3323
+#: ../backends/markup-tree.c:3328
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "不允许在 <%2$s> 元素内出现元素 <%1$s>"
 
-#: ../backends/markup-tree.c:3483
+#: ../backends/markup-tree.c:3472
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "不允许在元素 <%s> 内出现文字"
 
-#: ../backends/markup-tree.c:3600 ../backends/markup-tree.c:4366
-#: ../backends/markup-tree.c:4385
+#: ../backends/markup-tree.c:3588 ../backends/markup-tree.c:4354
+#: ../backends/markup-tree.c:4373
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "打开“%s”失败：%s\n"
 
-#: ../backends/markup-tree.c:3630
+#: ../backends/markup-tree.c:3618
 #, c-format
 msgid "Error reading \"%s\": %s\n"
 msgstr "读取“%s”出错：%s\n"
 
-#: ../backends/markup-tree.c:4460
+#: ../backends/markup-tree.c:4448
 #, c-format
 msgid "Could not flush file '%s' to disk: %s"
 msgstr "无法保存文件 '%s' 到磁盘：%s"
 
-#: ../backends/markup-tree.c:4479
+#: ../backends/markup-tree.c:4467
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "写入文件“%s”出错：%s"
 
-#: ../backends/markup-tree.c:4508
+#: ../backends/markup-tree.c:4496
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "将临时文件“%s”移至最终位置“%s”失败：%s"
@@ -614,17 +609,17 @@ msgstr "无法为“%s”定位后端模块"
 msgid "Failed to shut down backend"
 msgstr "关闭后端模块失败"
 
-#: ../gconf/gconf-client.c:345 ../gconf/gconf-client.c:363
+#: ../gconf/gconf-client.c:346 ../gconf/gconf-client.c:364
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf 错误：%s\n"
 
-#: ../gconf/gconf-client.c:913
+#: ../gconf/gconf-client.c:932
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 警告：列出“%s”中的配对失败：%s"
 
-#: ../gconf/gconf-client.c:1198
+#: ../gconf/gconf-client.c:1236
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "键 %3$s 需要“%1$s”，实际为“%2$s”"
@@ -948,8 +943,8 @@ msgstr "获取到会话的连接失败：%s"
 
 #: ../gconf/gconf-internals.c:2468
 #, c-format
-msgid "Could not send message to gconf daemon: %s"
-msgstr "无法发送消息到 gconf 守护进程：%s"
+msgid "Could not send message to GConf daemon: %s"
+msgstr "无法发送消息到 GConf 守护进程：%s"
 
 #: ../gconf/gconf-internals.c:2479
 #, c-format
@@ -966,47 +961,47 @@ msgstr "无法联系 ORB 以解决现有的 gconfd 对象引用"
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "将 IOR“%s”转换为对象引用失败"
 
-#: ../gconf/gconf-internals.c:2554
+#: ../gconf/gconf-internals.c:2556
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2611
+#: ../gconf/gconf-internals.c:2613
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "无法写入文件“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2652
+#: ../gconf/gconf-internals.c:2654
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "我们没有锁定文件“%s”，但应该锁定"
 
-#: ../gconf/gconf-internals.c:2675
+#: ../gconf/gconf-internals.c:2677
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "将“%s”链接到“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2687
+#: ../gconf/gconf-internals.c:2689
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "删除锁定文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2710
+#: ../gconf/gconf-internals.c:2712
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "清理文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2726
+#: ../gconf/gconf-internals.c:2728
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "删除锁定目录“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2864
+#: ../gconf/gconf-internals.c:2866
 #, c-format
 msgid "Server ping error: %s"
 msgstr "服务器 ping 错误：%s"
 
-#: ../gconf/gconf-internals.c:2883
+#: ../gconf/gconf-internals.c:2885
 #, c-format
 msgid ""
 "Failed to contact configuration server; some possible causes are that you "
@@ -1018,7 +1013,7 @@ msgstr ""
 "崩溃，您的 NFS 锁定已失效。请访问 http://projects.gnome.org/gconf/ 了解详细信"
 "息。(详细信息 - %s)"
 
-#: ../gconf/gconf-internals.c:2884
+#: ../gconf/gconf-internals.c:2886
 msgid "none"
 msgstr "无"
 
@@ -1285,77 +1280,77 @@ msgstr "键为 NULL"
 msgid "\"%s\": %s"
 msgstr "“%s”：%s"
 
-#: ../gconf/gconf.c:423
+#: ../gconf/gconf.c:418
 #, c-format
 msgid "Server couldn't resolve the address `%s'"
 msgstr "服务器无法解析地址“%s”"
 
-#: ../gconf/gconf.c:801
+#: ../gconf/gconf.c:808
 msgid "Can't add notifications to a local configuration source"
 msgstr "无法将通知添加到本地配置源"
 
-#: ../gconf/gconf.c:2251
+#: ../gconf/gconf.c:2258
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "将客户机添加到服务器列表失败，CORBA 错误：%s"
 
-#: ../gconf/gconf.c:2623
+#: ../gconf/gconf.c:2630
 msgid "Must begin with a slash '/'"
 msgstr "必须以斜杠 (/) 开头"
 
-#: ../gconf/gconf.c:2645
+#: ../gconf/gconf.c:2652
 msgid "Can't have two slashes '/' in a row"
 msgstr "一行不能有两个斜杠 (/)"
 
-#: ../gconf/gconf.c:2647
+#: ../gconf/gconf.c:2654
 msgid "Can't have a period '.' right after a slash '/'"
 msgstr "斜杠 (/) 后不能紧跟句号 (.)"
 
-#: ../gconf/gconf.c:2667
+#: ../gconf/gconf.c:2674
 #, c-format
 msgid "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 msgstr "'\\%o' 不是 ASCII 字符，不允许出现在键名称中"
 
-#: ../gconf/gconf.c:2677
+#: ../gconf/gconf.c:2684
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "“%c”在键/目录名称中是无效字符"
 
-#: ../gconf/gconf.c:2691
+#: ../gconf/gconf.c:2698
 msgid "Key/directory may not end with a slash '/'"
 msgstr "键/目录 不能以斜杠 (/) 结束"
 
-#: ../gconf/gconf.c:3062
+#: ../gconf/gconf.c:3069
 #, c-format
 msgid "Failure shutting down configuration server: %s"
 msgstr "关闭配置服务器失败：%s"
 
-#: ../gconf/gconf.c:3123
+#: ../gconf/gconf.c:3130
 #, c-format
 msgid "Expected float, got %s"
 msgstr "需要浮点数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3158
+#: ../gconf/gconf.c:3165
 #, c-format
 msgid "Expected int, got %s"
 msgstr "需要整数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3193
+#: ../gconf/gconf.c:3200
 #, c-format
 msgid "Expected string, got %s"
 msgstr "需要字符串，得到的值为 %s"
 
-#: ../gconf/gconf.c:3227
+#: ../gconf/gconf.c:3234
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "需要布尔值，得到的值为 %s"
 
-#: ../gconf/gconf.c:3260
+#: ../gconf/gconf.c:3267
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "需要 schema ，得到的值为 %s"
 
-#: ../gconf/gconf.c:3599
+#: ../gconf/gconf.c:3606
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA 错误：%s"
@@ -2559,6 +2554,9 @@ msgstr ""
 "正在试图通过为目录中的键设置不正确的值来破坏您的应用程序：\n"
 "  %s\n"
 
+#~ msgid "Attribute \"%s\" repeated twice on the same <%s> element"
+#~ msgstr "属性“%s”在同一个 <%s> 元素上重复两次"
+
 #~ msgid "IOR file '%s' not opened successfully, no gconfd located: %s"
 #~ msgstr "IOR 文件“%s”没有成功打开，无 gconfd 位于：%s"