Update Simplified Chinese translation.

1 files changed, 96 insertions, 96 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a85447f1..7d1b1dcb 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,10 +11,9 @@
 msgid ""
 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-09-03 11:57+0000\n"
-"PO-Revision-Date: 2009-09-07 21:59+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-09-15 15:39+0800\n"
+"PO-Revision-Date: 2010-09-15 15:39+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"
@@ -171,176 +170,176 @@ msgstr "初始化标记语言后端模块"
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "放弃锁定 XML 目录 “%s” 已失败：%s"
 
-#: ../backends/markup-tree.c:400
+#: ../backends/markup-tree.c:437
 #, c-format
 msgid "Failed to write some configuration data to disk\n"
 msgstr "将某些配置数据写入磁盘失败\n"
 
-#: ../backends/markup-tree.c:923 ../backends/xml-dir.c:1267
+#: ../backends/markup-tree.c:960 ../backends/xml-dir.c:1267
 #, c-format
 msgid "Could not make directory \"%s\": %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: ../backends/markup-tree.c:963 ../backends/markup-tree.c:970
+#: ../backends/markup-tree.c:1000 ../backends/markup-tree.c:1007
 #, c-format
 msgid "Could not remove \"%s\": %s\n"
 msgstr "无法删除文件“%s”：%s\n"
 
-#: ../backends/markup-tree.c:1171
+#: ../backends/markup-tree.c:1208
 #, c-format
 msgid "Failed to write \"%s\": %s\n"
 msgstr "写入“%s”失败：%s\n"
 
-#: ../backends/markup-tree.c:1379
+#: ../backends/markup-tree.c:1416
 #, c-format
 msgid "Failed to load file \"%s\": %s"
 msgstr "载入文件“%s”失败：%s"
 
-#: ../backends/markup-tree.c:1969
+#: ../backends/markup-tree.c:2006
 #, c-format
 msgid "Line %d character %d: %s"
 msgstr "第 %d 行第 %d 个字符：%s"
 
-#: ../backends/markup-tree.c:2197 ../backends/markup-tree.c:2218
+#: ../backends/markup-tree.c:2234 ../backends/markup-tree.c:2255
 #, c-format
 msgid "Attribute \"%s\" is invalid on <%s> element in this context"
 msgstr "在此上下文中，<%2$s> 元素的属性“%1$s”无效"
 
-#: ../backends/markup-tree.c:2243 ../gconf/gconf-value.c:111
+#: ../backends/markup-tree.c:2280 ../gconf/gconf-value.c:111
 #, c-format
 msgid "Didn't understand `%s' (expected integer)"
 msgstr "不理解“%s”(需要整数)"
 
-#: ../backends/markup-tree.c:2250 ../gconf/gconf-value.c:121
+#: ../backends/markup-tree.c:2287 ../gconf/gconf-value.c:121
 #, c-format
 msgid "Integer `%s' is too large or small"
 msgstr "整数“%s”过大或过小"
 
-#: ../backends/markup-tree.c:2282 ../gconf/gconf-value.c:186
+#: ../backends/markup-tree.c:2319 ../gconf/gconf-value.c:186
 #, c-format
 msgid "Didn't understand `%s' (expected true or false)"
 msgstr "不理解“%s”(需要 true 或 false)"
 
-#: ../backends/markup-tree.c:2306 ../gconf/gconf-value.c:142
+#: ../backends/markup-tree.c:2343 ../gconf/gconf-value.c:142
 #, c-format
 msgid "Didn't understand `%s' (expected real number)"
 msgstr "不理解“%s”(需要实数)"
 
-#: ../backends/markup-tree.c:2386
+#: ../backends/markup-tree.c:2423
 #, c-format
 msgid "Unknown value \"%s\" for \"%s\" attribute on element <%s>"
 msgstr "元素 <%3$s> 上的“%2$s”属性设置了未知值“%1$s”"
 
-#: ../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
+#: ../backends/markup-tree.c:2443 ../backends/markup-tree.c:2483
+#: ../backends/markup-tree.c:2507 ../backends/markup-tree.c:2515
+#: ../backends/markup-tree.c:2570 ../backends/markup-tree.c:2635
+#: ../backends/markup-tree.c:2747 ../backends/markup-tree.c:2815
+#: ../backends/markup-tree.c:2873 ../backends/markup-tree.c:3023
 #, c-format
 msgid "No \"%s\" attribute on element <%s>"
 msgstr "<%2$s> 元素没有“%1$s”属性"
 
-#: ../backends/markup-tree.c:2420
+#: ../backends/markup-tree.c:2457
 #, c-format
 msgid "Invalid ltype \"%s\" on <%s>"
 msgstr "<%2$s> 类型“%1$s”未知"
 
-#: ../backends/markup-tree.c:2500
+#: ../backends/markup-tree.c:2537
 #, c-format
 msgid "Invalid first-element type \"%s\" on <%s>"
 msgstr "<%2$s> 上第一元素的类型“%1$s”无效"
 
-#: ../backends/markup-tree.c:2514
+#: ../backends/markup-tree.c:2551
 #, c-format
 msgid "Invalid cdr_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 cdr_type“%1$s”无效"
 
-#: ../backends/markup-tree.c:2550
+#: ../backends/markup-tree.c:2587
 #, c-format
 msgid "Invalid list_type \"%s\" on <%s>"
 msgstr "<%2$s> 上 list_type“%1$s”无效"
 
-#: ../backends/markup-tree.c:2917
+#: ../backends/markup-tree.c:2954
 msgid "Two <default> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <default> 元素"
 
-#: ../backends/markup-tree.c:2932
+#: ../backends/markup-tree.c:2969
 msgid "Two <longdesc> elements below a <local_schema>"
 msgstr "一个 <local_schema> 下有两个 <longdesc> 元素"
 
-#: ../backends/markup-tree.c:2939
+#: ../backends/markup-tree.c:2976
 #, c-format
 msgid "Element <%s> is not allowed below <%s>"
 msgstr "不允许在 <%2$s> 下出现元素 <%1$s>"
 
-#: ../backends/markup-tree.c:2964 ../backends/markup-tree.c:3069
-#: ../backends/markup-tree.c:3123 ../backends/markup-tree.c:3174
+#: ../backends/markup-tree.c:3001 ../backends/markup-tree.c:3106
+#: ../backends/markup-tree.c:3160 ../backends/markup-tree.c:3211
 #, c-format
 msgid "<%s> provided but current element does not have type %s"
 msgstr "提供了 <%s> 但当前元素不拥有类型 %s"
 
-#: ../backends/markup-tree.c:3047
+#: ../backends/markup-tree.c:3084
 msgid "Two <car> elements given for same pair"
 msgstr "同一对给出了两个 <car> 元素"
 
-#: ../backends/markup-tree.c:3061
+#: ../backends/markup-tree.c:3098
 msgid "Two <cdr> elements given for same pair"
 msgstr "同一对给出了两个 <cdr> 元素"
 
-#: ../backends/markup-tree.c:3115
+#: ../backends/markup-tree.c:3152
 #, c-format
 msgid "<li> has wrong type %s"
 msgstr "<li> 的类型 %s 错误"
 
-#: ../backends/markup-tree.c:3146
+#: ../backends/markup-tree.c:3183
 #, c-format
 msgid "<%s> provided but parent <entry> does not have a value"
 msgstr "提供了 <%s> 但父 <entry> 没有值"
 
-#: ../backends/markup-tree.c:3187 ../backends/markup-tree.c:3210
-#: ../backends/markup-tree.c:3232 ../backends/markup-tree.c:3249
+#: ../backends/markup-tree.c:3224 ../backends/markup-tree.c:3247
+#: ../backends/markup-tree.c:3269 ../backends/markup-tree.c:3286
 #, c-format
 msgid "Element <%s> is not allowed inside current element"
 msgstr "不允许在当前元素中出现元素 <%s>"
 
-#: ../backends/markup-tree.c:3281
+#: ../backends/markup-tree.c:3318
 #, c-format
 msgid "Outermost element in menu file must be <gconf> not <%s>"
 msgstr "菜单文件中的最里层元素应该是 <gconf> 而非 <%s>"
 
-#: ../backends/markup-tree.c:3301 ../backends/markup-tree.c:3323
-#: ../backends/markup-tree.c:3328
+#: ../backends/markup-tree.c:3338 ../backends/markup-tree.c:3360
+#: ../backends/markup-tree.c:3365
 #, c-format
 msgid "Element <%s> is not allowed inside a <%s> element"
 msgstr "不允许在 <%2$s> 元素内出现元素 <%1$s>"
 
-#: ../backends/markup-tree.c:3472
+#: ../backends/markup-tree.c:3509
 #, c-format
 msgid "No text is allowed inside element <%s>"
 msgstr "不允许在元素 <%s> 内出现文字"
 
-#: ../backends/markup-tree.c:3588 ../backends/markup-tree.c:4354
-#: ../backends/markup-tree.c:4373
+#: ../backends/markup-tree.c:3625 ../backends/markup-tree.c:4391
+#: ../backends/markup-tree.c:4410
 #, c-format
 msgid "Failed to open \"%s\": %s\n"
 msgstr "打开“%s”失败：%s\n"
 
-#: ../backends/markup-tree.c:3618
+#: ../backends/markup-tree.c:3655
 #, c-format
 msgid "Error reading \"%s\": %s\n"
 msgstr "读取“%s”出错：%s\n"
 
-#: ../backends/markup-tree.c:4448
+#: ../backends/markup-tree.c:4485
 #, c-format
 msgid "Could not flush file '%s' to disk: %s"
 msgstr "无法保存文件 '%s' 到磁盘：%s"
 
-#: ../backends/markup-tree.c:4467
+#: ../backends/markup-tree.c:4504
 #, c-format
 msgid "Error writing file \"%s\": %s"
 msgstr "写入文件“%s”出错：%s"
 
-#: ../backends/markup-tree.c:4496
+#: ../backends/markup-tree.c:4533
 #, c-format
 msgid "Failed to move temporary file \"%s\" to final location \"%s\": %s"
 msgstr "将临时文件“%s”移至最终位置“%s”失败：%s"
@@ -609,17 +608,17 @@ msgstr "无法为“%s”定位后端模块"
 msgid "Failed to shut down backend"
 msgstr "关闭后端模块失败"
 
-#: ../gconf/gconf-client.c:346 ../gconf/gconf-client.c:364
+#: ../gconf/gconf-client.c:353 ../gconf/gconf-client.c:371
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf 错误：%s\n"
 
-#: ../gconf/gconf-client.c:932
+#: ../gconf/gconf-client.c:971
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 警告：列出“%s”中的配对失败：%s"
 
-#: ../gconf/gconf-client.c:1236
+#: ../gconf/gconf-client.c:1305
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "键 %3$s 需要“%1$s”，实际为“%2$s”"
@@ -860,7 +859,7 @@ msgstr "文件“%s”上的读取错误：%s\n"
 
 #: ../gconf/gconf-internals.c:1188 ../gconf/gconf-internals.c:1254
 #: ../gconf/gconf-value.c:155 ../gconf/gconf-value.c:254
-#: ../gconf/gconf-value.c:396 ../gconf/gconf-value.c:1668
+#: ../gconf/gconf-value.c:396 ../gconf/gconf-value.c:1704
 #, c-format
 msgid "Text contains invalid UTF-8"
 msgstr "文本包含无效的 UTF-8"
@@ -941,67 +940,62 @@ msgstr "未在活动会话中运行"
 msgid "Failed to get connection to session: %s"
 msgstr "获取到会话的连接失败：%s"
 
-#: ../gconf/gconf-internals.c:2468
+#: ../gconf/gconf-internals.c:2472
 #, c-format
-msgid "Could not send message to GConf daemon: %s"
-msgstr "无法发送消息到 GConf 守护进程：%s"
+msgid "GetIOR failed: %s"
+msgstr "GetIOR 失败：%s"
 
-#: ../gconf/gconf-internals.c:2479
-#, c-format
-msgid "daemon gave erroneous reply: %s"
-msgstr "守护进程返回错误的回复：%s"
-
-#: ../gconf/gconf-internals.c:2517
+#: ../gconf/gconf-internals.c:2509
 #, c-format
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "无法联系 ORB 以解决现有的 gconfd 对象引用"
 
-#: ../gconf/gconf-internals.c:2529
+#: ../gconf/gconf-internals.c:2521
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "将 IOR“%s”转换为对象引用失败"
 
-#: ../gconf/gconf-internals.c:2556
+#: ../gconf/gconf-internals.c:2548
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2613
+#: ../gconf/gconf-internals.c:2605
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "无法写入文件“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2654
+#: ../gconf/gconf-internals.c:2646
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "我们没有锁定文件“%s”，但应该锁定"
 
-#: ../gconf/gconf-internals.c:2677
+#: ../gconf/gconf-internals.c:2669
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "将“%s”链接到“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2689
+#: ../gconf/gconf-internals.c:2681
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "删除锁定文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2712
+#: ../gconf/gconf-internals.c:2704
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "清理文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2728
+#: ../gconf/gconf-internals.c:2720
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "删除锁定目录“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2866
+#: ../gconf/gconf-internals.c:2858
 #, c-format
 msgid "Server ping error: %s"
 msgstr "服务器 ping 错误：%s"
 
-#: ../gconf/gconf-internals.c:2885
+#: ../gconf/gconf-internals.c:2877
 #, c-format
 msgid ""
 "Failed to contact configuration server; some possible causes are that you "
@@ -1013,7 +1007,7 @@ msgstr ""
 "崩溃，您的 NFS 锁定已失效。请访问 http://projects.gnome.org/gconf/ 了解详细信"
 "息。(详细信息 - %s)"
 
-#: ../gconf/gconf-internals.c:2886
+#: ../gconf/gconf-internals.c:2878
 msgid "none"
 msgstr "无"
 
@@ -1285,87 +1279,87 @@ msgstr "“%s”：%s"
 msgid "Server couldn't resolve the address `%s'"
 msgstr "服务器无法解析地址“%s”"
 
-#: ../gconf/gconf.c:808
+#: ../gconf/gconf.c:854
 msgid "Can't add notifications to a local configuration source"
 msgstr "无法将通知添加到本地配置源"
 
-#: ../gconf/gconf.c:2258
+#: ../gconf/gconf.c:2332
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "将客户机添加到服务器列表失败，CORBA 错误：%s"
 
-#: ../gconf/gconf.c:2630
+#: ../gconf/gconf.c:2704
 msgid "Must begin with a slash '/'"
 msgstr "必须以斜杠 (/) 开头"
 
-#: ../gconf/gconf.c:2652
+#: ../gconf/gconf.c:2726
 msgid "Can't have two slashes '/' in a row"
 msgstr "一行不能有两个斜杠 (/)"
 
-#: ../gconf/gconf.c:2654
+#: ../gconf/gconf.c:2728
 msgid "Can't have a period '.' right after a slash '/'"
 msgstr "斜杠 (/) 后不能紧跟句号 (.)"
 
-#: ../gconf/gconf.c:2674
+#: ../gconf/gconf.c:2748
 #, c-format
 msgid "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 msgstr "'\\%o' 不是 ASCII 字符，不允许出现在键名称中"
 
-#: ../gconf/gconf.c:2684
+#: ../gconf/gconf.c:2758
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "“%c”在键/目录名称中是无效字符"
 
-#: ../gconf/gconf.c:2698
+#: ../gconf/gconf.c:2772
 msgid "Key/directory may not end with a slash '/'"
 msgstr "键/目录 不能以斜杠 (/) 结束"
 
-#: ../gconf/gconf.c:3069
+#: ../gconf/gconf.c:3143
 #, c-format
 msgid "Failure shutting down configuration server: %s"
 msgstr "关闭配置服务器失败：%s"
 
-#: ../gconf/gconf.c:3130
+#: ../gconf/gconf.c:3204
 #, c-format
 msgid "Expected float, got %s"
 msgstr "需要浮点数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3165
+#: ../gconf/gconf.c:3239
 #, c-format
 msgid "Expected int, got %s"
 msgstr "需要整数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3200
+#: ../gconf/gconf.c:3274
 #, c-format
 msgid "Expected string, got %s"
 msgstr "需要字符串，得到的值为 %s"
 
-#: ../gconf/gconf.c:3234
+#: ../gconf/gconf.c:3308
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "需要布尔值，得到的值为 %s"
 
-#: ../gconf/gconf.c:3267
+#: ../gconf/gconf.c:3355
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "需要 schema ，得到的值为 %s"
 
-#: ../gconf/gconf.c:3606
+#: ../gconf/gconf.c:3758
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA 错误：%s"
 
-#: ../gconf/gconfd.c:308
+#: ../gconf/gconfd.c:336
 msgid "Shutdown request received"
 msgstr "已接收到关闭请求"
 
-#: ../gconf/gconfd.c:340
+#: ../gconf/gconfd.c:368
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr "gconfd 用调试编译；尝试从源目录载入gconf.path"
 
-#: ../gconf/gconfd.c:360
+#: ../gconf/gconfd.c:388
 #, c-format
 msgid ""
 "No configuration files found. Trying to use the default configuration source "
@@ -1375,46 +1369,46 @@ msgstr "找不到配置文件，尝试使用默认配置源“%s”"
 #. We want to stay alive but do nothing, because otherwise every
 #. request would result in another failed gconfd being spawned.
 #.
-#: ../gconf/gconfd.c:368
+#: ../gconf/gconfd.c:396
 #, c-format
 msgid ""
 "No configuration sources in the source path. Configuration won't be saved; "
 "edit %s%s"
 msgstr "源路径中没有配置源，配置不会保存；请编辑 %s%s"
 
-#: ../gconf/gconfd.c:381
+#: ../gconf/gconfd.c:409
 #, c-format
 msgid "Error loading some configuration sources: %s"
 msgstr "载入某些配置源时出错：%s"
 
-#: ../gconf/gconfd.c:393
+#: ../gconf/gconfd.c:421
 msgid ""
 "No configuration source addresses successfully resolved. Can't load or store "
 "configuration data"
 msgstr "配置源地址无一解析成功，无法载入或存储配置数据"
 
-#: ../gconf/gconfd.c:410
+#: ../gconf/gconfd.c:438
 msgid ""
 "No writable configuration sources successfully resolved. May be unable to "
 "save some configuration changes"
 msgstr "可写配置源无一解析成功，可能无法保存某些配置更改"
 
-#: ../gconf/gconfd.c:591
+#: ../gconf/gconfd.c:603
 #, c-format
 msgid "Could not connect to session bus: %s"
 msgstr "无法连接到会话总线：%s"
 
-#: ../gconf/gconfd.c:613
+#: ../gconf/gconfd.c:625
 #, c-format
 msgid "Failed to get bus name for daemon, exiting: %s"
 msgstr "获取守护进程的总线名称失败，正在退出：%s"
 
-#: ../gconf/gconfd.c:694
+#: ../gconf/gconfd.c:706
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "无法连接到系统总线：%s"
 
-#: ../gconf/gconfd.c:830
+#: ../gconf/gconfd.c:842
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "正在启动(版本 %s)，pid %u 用户“%s”"
@@ -2554,6 +2548,12 @@ msgstr ""
 "正在试图通过为目录中的键设置不正确的值来破坏您的应用程序：\n"
 "  %s\n"
 
+#~ msgid "Could not send message to GConf daemon: %s"
+#~ msgstr "无法发送消息到 GConf 守护进程：%s"
+
+#~ msgid "daemon gave erroneous reply: %s"
+#~ msgstr "守护进程返回错误的回复：%s"
+
 #~ msgid "Attribute \"%s\" repeated twice on the same <%s> element"
 #~ msgstr "属性“%s”在同一个 <%s> 元素上重复两次"