update Simplified Chinese (zh_CN) translation

1 files changed, 205 insertions, 144 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index a6165e37..92cabea0 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,10 +12,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gconf master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=gconf&component=general\n"
-"POT-Creation-Date: 2011-03-06 07:57+0000\n"
-"PO-Revision-Date: 2011-03-09 18:49+0800\n"
-"Last-Translator: 李炜 <lw124124@gmail.com>\n"
+"product=gconf&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-13 00:07+0000\n"
+"PO-Revision-Date: 2011-09-13 11:34+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -135,39 +135,39 @@ msgstr "无法在地址“%s”处找到 XML 根目录"
 msgid "Could not make directory `%s': %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: ../backends/markup-backend.c:390 ../backends/xml-backend.c:442
+#: ../backends/markup-backend.c:392 ../backends/xml-backend.c:444
 #, c-format
 msgid ""
 "Can't read from or write to the XML root directory in the address \"%s\""
 msgstr "无法读取或写入地址“%s”中的 XML 根目录"
 
-#: ../backends/markup-backend.c:401 ../backends/xml-backend.c:452
+#: ../backends/markup-backend.c:403 ../backends/xml-backend.c:454
 #, c-format
 msgid "Directory/file permissions for XML source at root %s are: %o/%o"
 msgstr "位于根 %s 的 XML 源文件的目录/文件权限是：%o/%o"
 
-#: ../backends/markup-backend.c:740 ../backends/xml-backend.c:683
+#: ../backends/markup-backend.c:742 ../backends/xml-backend.c:685
 #, c-format
 msgid ""
 "Remove directory operation is no longer supported, just remove all the "
 "values in the directory"
 msgstr "删除目录操作不再支持，仅删除目录中所有的值"
 
-#: ../backends/markup-backend.c:826 ../backends/xml-backend.c:769
+#: ../backends/markup-backend.c:828 ../backends/xml-backend.c:771
 #, c-format
 msgid "Could not open lock directory for %s to remove locks: %s\n"
 msgstr "无法打开锁定目录以让 %s 删除锁定：%s\n"
 
-#: ../backends/markup-backend.c:839 ../backends/xml-backend.c:782
+#: ../backends/markup-backend.c:841 ../backends/xml-backend.c:784
 #, c-format
 msgid "Could not remove file %s: %s\n"
 msgstr "无法删除文件 %s：%s\n"
 
-#: ../backends/markup-backend.c:860
+#: ../backends/markup-backend.c:862
 msgid "Initializing Markup backend module"
 msgstr "初始化标记语言后端模块"
 
-#: ../backends/markup-backend.c:918 ../backends/xml-backend.c:880
+#: ../backends/markup-backend.c:923 ../backends/xml-backend.c:885
 #, c-format
 msgid "Failed to give up lock on XML directory \"%s\": %s"
 msgstr "放弃锁定 XML 目录 “%s” 已失败：%s"
@@ -350,12 +350,12 @@ msgstr "将临时文件“%s”移至最终位置“%s”失败：%s"
 msgid "Unloading XML backend module."
 msgstr "正在卸载 XML 后端模块。"
 
-#: ../backends/xml-backend.c:618
+#: ../backends/xml-backend.c:620
 #, c-format
 msgid "Error syncing the XML backend directory cache: %s"
 msgstr "在同步 XML 后端目录缓存时发生错误：%s"
 
-#: ../backends/xml-backend.c:809
+#: ../backends/xml-backend.c:811
 msgid "Initializing XML backend module"
 msgstr "正在初始化 XML 后端模块"
 
@@ -610,55 +610,55 @@ msgstr "无法为“%s”定位后端模块"
 msgid "Failed to shut down backend"
 msgstr "关闭后端模块失败"
 
-#: ../gconf/gconf-client.c:353 ../gconf/gconf-client.c:371
+#: ../gconf/gconf-client.c:358 ../gconf/gconf-client.c:376
 #, c-format
 msgid "GConf Error: %s\n"
 msgstr "GConf 错误：%s\n"
 
-#: ../gconf/gconf-client.c:971
+#: ../gconf/gconf-client.c:976
 #, c-format
 msgid "GConf warning: failure listing pairs in `%s': %s"
 msgstr "GConf 警告：列出“%s”中的配对失败：%s"
 
-#: ../gconf/gconf-client.c:1305
+#: ../gconf/gconf-client.c:1450
 #, c-format
 msgid "Expected `%s' got `%s' for key %s"
 msgstr "键 %3$s 需要“%1$s”，实际为“%2$s”"
 
-#: ../gconf/gconf-database.c:212
+#: ../gconf/gconf-database.c:217
 msgid "Received invalid value in set request"
 msgstr "在“设置”请求中收到无效值"
 
-#: ../gconf/gconf-database.c:220
+#: ../gconf/gconf-database.c:225
 #, c-format
 msgid "Couldn't make sense of CORBA value received in set request for key `%s'"
 msgstr "无法理解键“%s”的设置请求中接收到的 CORBA 值"
 
-#: ../gconf/gconf-database.c:503
+#: ../gconf/gconf-database.c:508
 msgid "Received request to drop all cached data"
 msgstr "接收到“丢弃所有缓冲的数据”的请求"
 
-#: ../gconf/gconf-database.c:520
+#: ../gconf/gconf-database.c:525
 msgid "Received request to sync synchronously"
 msgstr "接收到“同时进行同步”的请求"
 
-#: ../gconf/gconf-database.c:808
+#: ../gconf/gconf-database.c:818
 msgid "Fatal error: failed to get object reference for ConfigDatabase"
 msgstr "严重错误：为 ConfigDatabase 获取对象引用失败"
 
-#: ../gconf/gconf-database.c:974
+#: ../gconf/gconf-database.c:999
 #, c-format
 msgid "Failed to sync one or more sources: %s"
 msgstr "同步一个或多个源失败：%s"
 
-#: ../gconf/gconf-database.c:1047
+#: ../gconf/gconf-database.c:1074
 #, c-format
 msgid ""
 "Error obtaining new value for `%s' after change notification from backend `%"
 "s': %s"
 msgstr "在后端“%2$s”发送的更改通知后获取“%1$s”的新值出错：%3$s"
 
-#: ../gconf/gconf-database.c:1120
+#: ../gconf/gconf-database.c:1160
 #, c-format
 msgid ""
 "Failed to log addition of listener %s (%s); will not be able to restore this "
@@ -668,12 +668,12 @@ msgstr ""
 "记录新监听程序 %s 失败(%s)；将无法在 gconfd 重启时恢复该监听程序，这会导致配"
 "置更改的通知不可靠。"
 
-#: ../gconf/gconf-database.c:1154
+#: ../gconf/gconf-database.c:1194
 #, c-format
 msgid "Listener ID %lu doesn't exist"
 msgstr "监听程序 ID %lu 不存在"
 
-#: ../gconf/gconf-database.c:1168
+#: ../gconf/gconf-database.c:1208
 #, c-format
 msgid ""
 "Failed to log removal of listener to logfile (most likely harmless, may "
@@ -682,61 +682,104 @@ msgstr ""
 "向日志文件记录删除了监听程序失败(多半无害，可能会导致某个通知奇怪地反复出"
 "现)：%s"
 
-#: ../gconf/gconf-database.c:1301 ../gconf/gconf-sources.c:1737
+#: ../gconf/gconf-database.c:1342 ../gconf/gconf-sources.c:1737
 #, c-format
 msgid "Error getting value for `%s': %s"
 msgstr "获取“%s”的值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1351
+#: ../gconf/gconf-database.c:1394
 #, c-format
 msgid "Error setting value for `%s': %s"
 msgstr "设置“%s”的值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1399
+#: ../gconf/gconf-database.c:1455
 #, c-format
 msgid "Error unsetting `%s': %s"
 msgstr "取消“%s”设置值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1428
+#: ../gconf/gconf-database.c:1484
 #, c-format
 msgid "Error getting default value for `%s': %s"
 msgstr "获取“%s”的默认值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1486
+#: ../gconf/gconf-database.c:1560
 #, c-format
 msgid "Error unsetting \"%s\": %s"
 msgstr "取消“%s”的设置值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1517
+#: ../gconf/gconf-database.c:1591
 #, c-format
 msgid "Error getting new value for \"%s\": %s"
 msgstr "获取“%s”的新值时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1572
+#: ../gconf/gconf-database.c:1662
 #, c-format
 msgid "Error checking existence of `%s': %s"
 msgstr "检查“%s”的存在时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1596
+#: ../gconf/gconf-database.c:1686
 #, c-format
 msgid "Error removing directory \"%s\": %s"
 msgstr "删除目录“%s”发生错误：%s"
 
-#: ../gconf/gconf-database.c:1623
+#: ../gconf/gconf-database.c:1713
 #, c-format
 msgid "Failed to get all entries in `%s': %s"
 msgstr "获取“%s”中的所有项失败：%s"
 
-#: ../gconf/gconf-database.c:1649
+#: ../gconf/gconf-database.c:1739
 #, c-format
 msgid "Error listing dirs in `%s': %s"
 msgstr "列出“%s”中的目录时发生错误：%s"
 
-#: ../gconf/gconf-database.c:1670
+#: ../gconf/gconf-database.c:1760
 #, c-format
 msgid "Error setting schema for `%s': %s"
 msgstr "为“%s”设置模式时发生错误：%s"
 
+#: ../gconf/gconf-database-dbus.c:788
+#, c-format
+msgid "Notification on %s doesn't exist"
+msgstr "%s 上的通知不存在"
+
+#: ../gconf/gconf-dbus.c:219 ../gconf/gconf-dbus.c:250
+#, c-format
+msgid "D-BUS error: %s"
+msgstr "D-BUS 错误：%s"
+
+#: ../gconf/gconf-dbus.c:226 ../gconf/gconf-dbus.c:466
+msgid "Unknown error"
+msgstr "未知错误"
+
+#: ../gconf/gconf-dbus.c:266
+#, c-format
+msgid "Unknown error %s: %s"
+msgstr "未知错误 %s：%s"
+
+#: ../gconf/gconf-dbus.c:439
+#, c-format
+msgid "No D-BUS daemon running\n"
+msgstr "D-BUS 守护进程没有运行\n"
+
+#: ../gconf/gconf-dbus.c:470
+#, c-format
+msgid "Failed to activate configuration server: %s\n"
+msgstr "启用配置服务器失败：%s\n"
+
+#: ../gconf/gconf-dbus.c:568 ../gconf/gconf.c:424
+#, c-format
+msgid "Server couldn't resolve the address `%s'"
+msgstr "服务器无法解析地址“%s”"
+
+#: ../gconf/gconf-dbus.c:1044 ../gconf/gconf.c:860
+msgid "Can't add notifications to a local configuration source"
+msgstr "无法将通知添加到本地配置源"
+
+#: ../gconf/gconf-dbus.c:1230 ../gconf/gconf-dbus.c:1412
+#, c-format
+msgid "Couldn't get value"
+msgstr "无法获取值"
+
 #: ../gconf/gconf-error.c:26
 msgid "Success"
 msgstr "成功"
@@ -806,119 +849,119 @@ msgstr "没有可用的数据库来保存您的配置"
 msgid "No '/' in key \"%s\""
 msgstr "在键“%s”中没有“/”"
 
-#: ../gconf/gconf-internals.c:182
+#: ../gconf/gconf-internals.c:183
 #, c-format
 msgid "Invalid UTF-8 in string value in '%s'"
 msgstr "“%s”中有无效的 UTF-8 字符串值"
 
-#: ../gconf/gconf-internals.c:241
+#: ../gconf/gconf-internals.c:242
 msgid "Couldn't interpret CORBA value for list element"
 msgstr "无法为列表元素解释 CORBA 值"
 
-#: ../gconf/gconf-internals.c:243
+#: ../gconf/gconf-internals.c:244
 #, c-format
 msgid "Incorrect type for list element in %s"
 msgstr "%s 中有不正确的列表元素类型"
 
-#: ../gconf/gconf-internals.c:256
+#: ../gconf/gconf-internals.c:257
 msgid "Received list from gconfd with a bad list type"
 msgstr "从 gconfd 接收到的列表的列表类型不正确"
 
-#: ../gconf/gconf-internals.c:437
+#: ../gconf/gconf-internals.c:438
 msgid "Failed to convert object to IOR"
 msgstr "将对象转换到 IOR 失败"
 
-#: ../gconf/gconf-internals.c:574
+#: ../gconf/gconf-internals.c:575
 msgid "Invalid UTF-8 in locale for schema"
 msgstr "schema 的区域设置中有无效的 UTF-8 字符"
 
-#: ../gconf/gconf-internals.c:582
+#: ../gconf/gconf-internals.c:583
 msgid "Invalid UTF-8 in short description for schema"
 msgstr "schema 的简短说明中有无效的 UTF-8 字符"
 
-#: ../gconf/gconf-internals.c:590
+#: ../gconf/gconf-internals.c:591
 msgid "Invalid UTF-8 in long description for schema"
 msgstr "schema 的详细说明中有无效的 UTF-8 字符"
 
-#: ../gconf/gconf-internals.c:598
+#: ../gconf/gconf-internals.c:599
 msgid "Invalid UTF-8 in owner for schema"
 msgstr "schema 的所有者中有无效的 UTF-8 字符"
 
-#: ../gconf/gconf-internals.c:843
+#: ../gconf/gconf-internals.c:845
 #, c-format
 msgid "Couldn't open path file `%s': %s\n"
 msgstr "无法打开路径文件“%s”：%s\n"
 
-#: ../gconf/gconf-internals.c:899
+#: ../gconf/gconf-internals.c:901
 #, c-format
 msgid "Adding source `%s'\n"
 msgstr "正在添加源“%s”\n"
 
-#: ../gconf/gconf-internals.c:914
+#: ../gconf/gconf-internals.c:916
 #, c-format
 msgid "Read error on file `%s': %s\n"
 msgstr "文件“%s”上的读取错误：%s\n"
 
-#: ../gconf/gconf-internals.c:1188 ../gconf/gconf-internals.c:1254
+#: ../gconf/gconf-internals.c:1190 ../gconf/gconf-internals.c:1256
 #: ../gconf/gconf-value.c:155 ../gconf/gconf-value.c:254
 #: ../gconf/gconf-value.c:396 ../gconf/gconf-value.c:1706
 #, c-format
 msgid "Text contains invalid UTF-8"
 msgstr "文本包含无效的 UTF-8"
 
-#: ../gconf/gconf-internals.c:1339
+#: ../gconf/gconf-internals.c:1341
 #, c-format
 msgid "Expected list, got %s"
 msgstr "需要列表，得到的是 %s"
 
-#: ../gconf/gconf-internals.c:1349
+#: ../gconf/gconf-internals.c:1351
 #, c-format
 msgid "Expected list of %s, got list of %s"
 msgstr "需要 %s 列表，得到的是 %s 列表"
 
-#: ../gconf/gconf-internals.c:1477
+#: ../gconf/gconf-internals.c:1479
 #, c-format
 msgid "Expected pair, got %s"
 msgstr "需要对，得到的是 %s"
 
-#: ../gconf/gconf-internals.c:1491
+#: ../gconf/gconf-internals.c:1493
 #, c-format
 msgid "Expected (%s,%s) pair, got a pair with one or both values missing"
 msgstr "需要 (%s,%s) 对，得到的对仅有一个值或两个值都没有"
 
-#: ../gconf/gconf-internals.c:1507
+#: ../gconf/gconf-internals.c:1509
 #, c-format
 msgid "Expected pair of type (%s,%s) got type (%s,%s)"
 msgstr "需要类型 (%s,%s) 对，得到的是类型 (%s,%s)"
 
-#: ../gconf/gconf-internals.c:1623
+#: ../gconf/gconf-internals.c:1625
 msgid "Quoted string doesn't begin with a quotation mark"
 msgstr "引用的字符串不是以引号开始"
 
-#: ../gconf/gconf-internals.c:1684
+#: ../gconf/gconf-internals.c:1686
 msgid "Quoted string doesn't end with a quotation mark"
 msgstr "引用的字符串不是以引号结束"
 
-#: ../gconf/gconf-internals.c:1802
+#: ../gconf/gconf-internals.c:1804
 msgid "Encoded value is not valid UTF-8"
 msgstr "已编码的值不是有效的 UTF-8"
 
-#: ../gconf/gconf-internals.c:2286
+#: ../gconf/gconf-internals.c:2289
 #, c-format
 msgid "Could not lock temporary file '%s': %s"
 msgstr "无法锁住临时文件“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2313
+#: ../gconf/gconf-internals.c:2316
 #, c-format
 msgid "Could not create file '%s', probably because it already exists"
 msgstr "无法创建文件“%s”，也许它已经存在"
 
-#: ../gconf/gconf-internals.c:2381
+#: ../gconf/gconf-internals.c:2384
 #, c-format
 msgid "Failed to create or open '%s'"
 msgstr "创建或打开“%s”失败"
 
-#: ../gconf/gconf-internals.c:2391
+#: ../gconf/gconf-internals.c:2394
 #, c-format
 msgid ""
 "Failed to lock '%s': probably another process has the lock, or your "
@@ -927,77 +970,77 @@ msgstr ""
 "锁定“%s”失败：可能另一个进程已锁定它，或者您的操作系统的 NFS 文件锁定配置不正"
 "确 (%s)"
 
-#: ../gconf/gconf-internals.c:2411
+#: ../gconf/gconf-internals.c:2414
 #, c-format
 msgid "Failed to remove '%s': %s"
 msgstr "删除“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2439
+#: ../gconf/gconf-internals.c:2442
 #, c-format
 msgid "Not running within active session"
 msgstr "未在活动会话中运行"
 
-#: ../gconf/gconf-internals.c:2449
+#: ../gconf/gconf-internals.c:2452
 #, c-format
 msgid "Failed to get connection to session: %s"
 msgstr "获取到会话的连接失败：%s"
 
-#: ../gconf/gconf-internals.c:2472
+#: ../gconf/gconf-internals.c:2475
 #, c-format
 msgid "GetIOR failed: %s"
 msgstr "GetIOR 失败：%s"
 
-#: ../gconf/gconf-internals.c:2509
+#: ../gconf/gconf-internals.c:2512
 #, c-format
 msgid "couldn't contact ORB to resolve existing gconfd object reference"
 msgstr "无法联系 ORB 以解决现有的 gconfd 对象引用"
 
-#: ../gconf/gconf-internals.c:2521
+#: ../gconf/gconf-internals.c:2524
 #, c-format
 msgid "Failed to convert IOR '%s' to an object reference"
 msgstr "将 IOR“%s”转换为对象引用失败"
 
-#: ../gconf/gconf-internals.c:2548
+#: ../gconf/gconf-internals.c:2551
 #, c-format
 msgid "couldn't create directory `%s': %s"
 msgstr "无法创建目录“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2605
+#: ../gconf/gconf-internals.c:2608
 #, c-format
 msgid "Can't write to file `%s': %s"
 msgstr "无法写入文件“%s”：%s"
 
-#: ../gconf/gconf-internals.c:2646
+#: ../gconf/gconf-internals.c:2649
 #, c-format
 msgid "We didn't have the lock on file `%s', but we should have"
 msgstr "我们没有锁定文件“%s”，但应该锁定"
 
-#: ../gconf/gconf-internals.c:2669
+#: ../gconf/gconf-internals.c:2672
 #, c-format
 msgid "Failed to link '%s' to '%s': %s"
 msgstr "将“%s”链接到“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2681
+#: ../gconf/gconf-internals.c:2684
 #, c-format
 msgid "Failed to remove lock file `%s': %s"
 msgstr "删除锁定文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2704
+#: ../gconf/gconf-internals.c:2707
 #, c-format
 msgid "Failed to clean up file '%s': %s"
 msgstr "清理文件“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2720
+#: ../gconf/gconf-internals.c:2723
 #, c-format
 msgid "Failed to remove lock directory `%s': %s"
 msgstr "删除锁定目录“%s”失败：%s"
 
-#: ../gconf/gconf-internals.c:2858
+#: ../gconf/gconf-internals.c:2861
 #, c-format
 msgid "Server ping error: %s"
 msgstr "服务器 ping 错误：%s"
 
-#: ../gconf/gconf-internals.c:2877
+#: ../gconf/gconf-internals.c:2880
 #, c-format
 msgid ""
 "Failed to contact configuration server; the most common cause is a missing "
@@ -1007,7 +1050,7 @@ msgstr ""
 "联系配置服务器失败，可能的原因是没有或不当配置的 D-Bus 会话总线守护进程。请访"
 "问 http://projects.gnome.org/gconf/ 了解详细信息。(详细信息 - %s)"
 
-#: ../gconf/gconf-internals.c:2878
+#: ../gconf/gconf-internals.c:2881
 msgid "none"
 msgstr "无"
 
@@ -1265,101 +1308,92 @@ msgstr "不理解“%s”(元素数不正确)"
 msgid "Didn't understand `%s' (extra unescaped ')' found inside pair)"
 msgstr "不理解“%s”(在 pair 中找到多余的非换码字符“)”)"
 
-#: ../gconf/gconf.c:95
+#: ../gconf/gconf.c:100
 msgid "Key is NULL"
 msgstr "键为 NULL"
 
-#: ../gconf/gconf.c:102
+#: ../gconf/gconf.c:107
 #, c-format
 msgid "\"%s\": %s"
 msgstr "“%s”：%s"
 
-#: ../gconf/gconf.c:418
-#, c-format
-msgid "Server couldn't resolve the address `%s'"
-msgstr "服务器无法解析地址“%s”"
-
-#: ../gconf/gconf.c:854
-msgid "Can't add notifications to a local configuration source"
-msgstr "无法将通知添加到本地配置源"
-
-#: ../gconf/gconf.c:2332
+#: ../gconf/gconf.c:2338
 #, c-format
 msgid "Adding client to server's list failed, CORBA error: %s"
 msgstr "将客户机添加到服务器列表失败，CORBA 错误：%s"
 
-#: ../gconf/gconf.c:2704
+#: ../gconf/gconf.c:2711
 msgid "Must begin with a slash '/'"
 msgstr "必须以斜杠 (/) 开头"
 
-#: ../gconf/gconf.c:2726
+#: ../gconf/gconf.c:2733
 msgid "Can't have two slashes '/' in a row"
 msgstr "一行不能有两个斜杠 (/)"
 
-#: ../gconf/gconf.c:2728
+#: ../gconf/gconf.c:2735
 msgid "Can't have a period '.' right after a slash '/'"
 msgstr "斜杠 (/) 后不能紧跟句号 (.)"
 
-#: ../gconf/gconf.c:2748
+#: ../gconf/gconf.c:2755
 #, c-format
 msgid "'\\%o' is not an ASCII character and thus isn't allowed in key names"
 msgstr "'\\%o' 不是 ASCII 字符，不允许出现在键名称中"
 
-#: ../gconf/gconf.c:2758
+#: ../gconf/gconf.c:2765
 #, c-format
 msgid "`%c' is an invalid character in key/directory names"
 msgstr "“%c”在键/目录名称中是无效字符"
 
-#: ../gconf/gconf.c:2772
+#: ../gconf/gconf.c:2779
 msgid "Key/directory may not end with a slash '/'"
 msgstr "键/目录 不能以斜杠 (/) 结束"
 
-#: ../gconf/gconf.c:3143
+#: ../gconf/gconf.c:3151
 #, c-format
 msgid "Failure shutting down configuration server: %s"
 msgstr "关闭配置服务器失败：%s"
 
-#: ../gconf/gconf.c:3204
+#: ../gconf/gconf.c:3213
 #, c-format
 msgid "Expected float, got %s"
 msgstr "需要浮点数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3239
+#: ../gconf/gconf.c:3248
 #, c-format
 msgid "Expected int, got %s"
 msgstr "需要整数，得到的值为 %s"
 
-#: ../gconf/gconf.c:3274
+#: ../gconf/gconf.c:3283
 #, c-format
 msgid "Expected string, got %s"
 msgstr "需要字符串，得到的值为 %s"
 
-#: ../gconf/gconf.c:3308
+#: ../gconf/gconf.c:3317
 #, c-format
 msgid "Expected bool, got %s"
 msgstr "需要布尔值，得到的值为 %s"
 
-#: ../gconf/gconf.c:3355
+#: ../gconf/gconf.c:3364
 #, c-format
 msgid "Expected schema, got %s"
 msgstr "需要 schema ，得到的值为 %s"
 
-#: ../gconf/gconf.c:3758
+#: ../gconf/gconf.c:3768
 #, c-format
 msgid "CORBA error: %s"
 msgstr "CORBA 错误：%s"
 
-#: ../gconf/gconfd.c:336
+#: ../gconf/gconfd.c:344 ../gconf/gconfd-dbus.c:186
 msgid "Shutdown request received"
 msgstr "已接收到关闭请求"
 
-#: ../gconf/gconfd.c:368
+#: ../gconf/gconfd.c:377
 msgid ""
 "gconfd compiled with debugging; trying to load gconf.path from the source "
 "directory"
 msgstr "gconfd 用调试编译；尝试从源目录载入gconf.path"
 
-#: ../gconf/gconfd.c:388
+#: ../gconf/gconfd.c:397
 #, c-format
 msgid ""
 "No configuration files found. Trying to use the default configuration source "
@@ -1369,154 +1403,154 @@ 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:396
+#: ../gconf/gconfd.c:405
 #, c-format
 msgid ""
 "No configuration sources in the source path. Configuration won't be saved; "
 "edit %s%s"
 msgstr "源路径中没有配置源，配置不会保存；请编辑 %s%s"
 
-#: ../gconf/gconfd.c:409
+#: ../gconf/gconfd.c:418
 #, c-format
 msgid "Error loading some configuration sources: %s"
 msgstr "载入某些配置源时出错：%s"
 
-#: ../gconf/gconfd.c:421
+#: ../gconf/gconfd.c:430
 msgid ""
 "No configuration source addresses successfully resolved. Can't load or store "
 "configuration data"
 msgstr "配置源地址无一解析成功，无法载入或存储配置数据"
 
-#: ../gconf/gconfd.c:438
+#: ../gconf/gconfd.c:447
 msgid ""
 "No writable configuration sources successfully resolved. May be unable to "
 "save some configuration changes"
 msgstr "可写配置源无一解析成功，可能无法保存某些配置更改"
 
-#: ../gconf/gconfd.c:603
+#: ../gconf/gconfd.c:615
 #, c-format
 msgid "Could not connect to session bus: %s"
 msgstr "无法连接到会话总线：%s"
 
-#: ../gconf/gconfd.c:625
+#: ../gconf/gconfd.c:637
 #, c-format
 msgid "Failed to get bus name for daemon, exiting: %s"
 msgstr "获取守护进程的总线名称失败，正在退出：%s"
 
-#: ../gconf/gconfd.c:706
+#: ../gconf/gconfd.c:719
 #, c-format
 msgid "Could not connect to system bus: %s"
 msgstr "无法连接到系统总线：%s"
 
-#: ../gconf/gconfd.c:842
+#: ../gconf/gconfd.c:858
 #, c-format
 msgid "starting (version %s), pid %u user '%s'"
 msgstr "正在启动(版本 %s)，pid %u 用户“%s”"
 
-#: ../gconf/gconfd.c:890
+#: ../gconf/gconfd.c:914
 msgid "Failed to get object reference for ConfigServer"
 msgstr "获取 ConfigServer 的对象引用失败"
 
-#: ../gconf/gconfd.c:919
+#: ../gconf/gconfd.c:949
 #, c-format
 msgid ""
 "Failed to write byte to pipe file descriptor %d so client program may hang: %"
 "s"
 msgstr "将字节写入管道文件描述符 %d 失败，所以客户端程序可能挂起：%s"
 
-#: ../gconf/gconfd.c:965
+#: ../gconf/gconfd.c:1001
 #, c-format
 msgid "Error releasing lockfile: %s"
 msgstr "释放锁定文件时出错：%s"
 
-#: ../gconf/gconfd.c:973
+#: ../gconf/gconfd.c:1010
 msgid "Exiting"
 msgstr "退出"
 
-#: ../gconf/gconfd.c:991
+#: ../gconf/gconfd.c:1028
 msgid "SIGHUP received, reloading all databases"
 msgstr "收到了 SIGHUP，重新装入全部数据库"
 
-#: ../gconf/gconfd.c:1008
+#: ../gconf/gconfd.c:1055
 msgid "GConf server is not in use, shutting down."
 msgstr "GConf 服务器不在使用，正在关闭。"
 
-#: ../gconf/gconfd.c:1334
+#: ../gconf/gconfd.c:1385
 #, c-format
 msgid "Error obtaining new value for `%s': %s"
 msgstr "获取“%s”的新值时发生错误：%s"
 
-#: ../gconf/gconfd.c:1478
+#: ../gconf/gconfd.c:1541
 #, c-format
 msgid "Returning exception: %s"
 msgstr "返回异常：%s"
 
-#: ../gconf/gconfd.c:1584
+#: ../gconf/gconfd.c:1647
 #, c-format
 msgid ""
 "Failed to open gconfd logfile; won't be able to restore listeners after "
 "gconfd shutdown (%s)"
 msgstr "打开 gconfd 日志文件失败；无法在gconfd 关闭后恢复监听程序 (%s)"
 
-#: ../gconf/gconfd.c:1619
+#: ../gconf/gconfd.c:1682
 #, c-format
 msgid ""
 "Failed to close gconfd logfile; data may not have been properly saved (%s)"
 msgstr "关闭 gconfd 日志文件失败；数据可能没有正确保存 (%s)"
 
-#: ../gconf/gconfd.c:1681
+#: ../gconf/gconfd.c:1744
 #, c-format
 msgid "Could not open saved state file '%s' for writing: %s"
 msgstr "无法打开已保存的状态文件“%s”进行写入：%s"
 
-#: ../gconf/gconfd.c:1695
+#: ../gconf/gconfd.c:1758
 #, c-format
 msgid "Could not write saved state file '%s' fd: %d: %s"
 msgstr "无法写入已保存的状态文件“%s”fd：%d：%s"
 
-#: ../gconf/gconfd.c:1704
+#: ../gconf/gconfd.c:1767
 #, c-format
 msgid "Could not flush saved state file '%s' to disk: %s"
 msgstr "无法保存已保存的状态文件“%s” 到磁盘：%s"
 
-#: ../gconf/gconfd.c:1711
+#: ../gconf/gconfd.c:1774
 #, c-format
 msgid "Failed to close new saved state file '%s': %s"
 msgstr "关闭新保存的状态文件“%s”失败：%s"
 
-#: ../gconf/gconfd.c:1725
+#: ../gconf/gconfd.c:1788
 #, c-format
 msgid "Could not move aside old saved state file '%s': %s"
 msgstr "无法移走已保存的旧状态文件“%s”：%s"
 
-#: ../gconf/gconfd.c:1735
+#: ../gconf/gconfd.c:1798
 #, c-format
 msgid "Failed to move new saved state file into place: %s"
 msgstr "无法将新保存的状态文件移入位置：%s"
 
-#: ../gconf/gconfd.c:1744
+#: ../gconf/gconfd.c:1807
 #, c-format
 msgid ""
 "Failed to restore original saved state file that had been moved to '%s': %s"
 msgstr "恢复已移动到“%s”的原保存的状态文件失败：%s"
 
-#: ../gconf/gconfd.c:2223
+#: ../gconf/gconfd.c:2286
 #, c-format
 msgid ""
 "Unable to restore a listener on address '%s', couldn't resolve the database"
 msgstr "无法恢复地址“%s”上的监听程序，不能解析该数据库"
 
-#: ../gconf/gconfd.c:2259
+#: ../gconf/gconfd.c:2322
 #, c-format
 msgid "Error reading saved state file: %s"
 msgstr "读取已保存的状态文件时出错：%s"
 
-#: ../gconf/gconfd.c:2309
+#: ../gconf/gconfd.c:2372
 #, c-format
 msgid "Unable to open saved state file '%s': %s"
 msgstr "无法打开已保存的状态文件“%s”：%s"
 
-#: ../gconf/gconfd.c:2428
+#: ../gconf/gconfd.c:2491
 #, c-format
 msgid ""
 "Failed to log addition of listener to gconfd logfile; won't be able to re-"
@@ -1525,7 +1559,7 @@ msgstr ""
 "向 gconfd 日志文件记录添加监听程序失败；如果 gconfd 退出或关闭，将无法重新添"
 "加该监听程序 (%s)"
 
-#: ../gconf/gconfd.c:2433
+#: ../gconf/gconfd.c:2496
 #, c-format
 msgid ""
 "Failed to log removal of listener to gconfd logfile; might erroneously re-"
@@ -1534,31 +1568,61 @@ msgstr ""
 "从 gconfd 日志文件记录删除监听程序失败；如果 gconfd 退出或关闭，可能会错误地"
 "重新添加该监听程序 (%s)"
 
-#: ../gconf/gconfd.c:2456 ../gconf/gconfd.c:2630
+#: ../gconf/gconfd.c:2519 ../gconf/gconfd.c:2693
 #, c-format
 msgid "Failed to get IOR for client: %s"
 msgstr "获得客户端的 IOR 失败：%s"
 
-#: ../gconf/gconfd.c:2471
+#: ../gconf/gconfd.c:2534
 #, c-format
 msgid "Failed to open saved state file: %s"
 msgstr "打开已保存的状态文件失败：%s"
 
-#: ../gconf/gconfd.c:2484
+#: ../gconf/gconfd.c:2547
 #, c-format
 msgid "Failed to write client add to saved state file: %s"
 msgstr "将客户端添加写入已保存的状态文件失败：%s"
 
-#: ../gconf/gconfd.c:2492
+#: ../gconf/gconfd.c:2555
 #, c-format
 msgid "Failed to flush client add to saved state file: %s"
 msgstr "将客户端添加刷新到已保存的状态文件失败：%s"
 
-#: ../gconf/gconfd.c:2591
+#: ../gconf/gconfd.c:2654
 msgid ""
 "Some client removed itself from the GConf server when it hadn't been added."
 msgstr "当某个客户端未被添加时，它将自己从 GConf 服务器中删除。"
 
+#: ../gconf/gconfd-dbus.c:209
+#, c-format
+msgid ""
+"Daemon failed to connect to the D-BUS daemon:\n"
+"%s"
+msgstr ""
+"守护进程无法连接到 D-BUS 守护进程：\n"
+"%s"
+
+#: ../gconf/gconfd-dbus.c:236
+#, c-format
+msgid ""
+"Daemon failed to acquire gconf service:\n"
+"%s"
+msgstr ""
+"守护进程无法获取 gconf 服务：\n"
+"%s"
+
+#: ../gconf/gconfd-dbus.c:247
+msgid "Failed to register server object with the D-BUS bus daemon"
+msgstr "无法通过 D-BUS 总线守护进程注册服务对象"
+
+#: ../gconf/gconfd-dbus.c:282
+msgid "Got a malformed message."
+msgstr "收到了损坏的消息。"
+
+#: ../gconf/gconfd-dbus.c:377
+msgid "The GConf daemon is currently shutting down."
+msgstr "GConf 守护进程正在关闭。"
+
 #: ../gconf/gconftool.c:93
 msgid "Set a key to a value and sync. Use with --type."
 msgstr "将键设置为值和同步。使用 --type。"
@@ -2581,9 +2645,6 @@ msgstr "由 GConf 迁移用户设置到 dconf "
 #~ "Failed to create pipe for communicating with spawned gconf daemon: %s\n"
 #~ msgstr "创建与产生的 gconf 守护进程通讯的管道失败：%s\n"
 
-#~ msgid "Failed to launch configuration server: %s\n"
-#~ msgstr "启动配置服务器失败：%s\n"
-
 #~ msgid "Failed to open %s: %s"
 #~ msgstr "打开 %s 失败：%s"