Update Simplified Chinese translation.

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 9623e00..0db599f 100644 (file)
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -16,10 +16,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-03-27 21:50+0000\n"
-"PO-Revision-Date: 2011-03-28 18:16+0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-03-28 10:20+0000\n"
+"PO-Revision-Date: 2011-03-28 10:21+0000\n"
 "Last-Translator: liwei <lw124124@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
@@ -1893,24 +1892,24 @@ msgstr "发送信息出错：%s"
 msgid "Unable to load /var/lib/dbus/machine-id: "
 msgstr "无法加载 /var/lib/dbus/machine-id："
 
-#: ../gio/gdbusproxy.c:714
+#: ../gio/gdbusproxy.c:715
 #, c-format
 msgid ""
 "Trying to set property %s of type %s but according to the expected interface "
 "the type is %s"
 msgstr "尝试设置类型 %s 的属性 %s，但是根据期望的接口，类型是 %s"
 
-#: ../gio/gdbusproxy.c:1234
+#: ../gio/gdbusproxy.c:1235
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "为 %s 调用 StartServiceByName 出错："
 
-#: ../gio/gdbusproxy.c:1255
+#: ../gio/gdbusproxy.c:1256
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d"
 
-#: ../gio/gdbusproxy.c:2311 ../gio/gdbusproxy.c:2469
+#: ../gio/gdbusproxy.c:2312 ../gio/gdbusproxy.c:2470
 msgid ""
 "Cannot invoke method; proxy is for a well-known name without an owner and "
 "proxy was constructed with the G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START flag"
@@ -1918,34 +1917,34 @@ msgstr ""
 "无法调用方法；代理名称为常见的无所有者的名称，而代理使用 "
 "G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START 标记构建。"
 
-#: ../gio/gdbusserver.c:715
+#: ../gio/gdbusserver.c:706
 msgid "Abstract name space not supported"
 msgstr "不支持抽象命名空间"
 
-#: ../gio/gdbusserver.c:805
+#: ../gio/gdbusserver.c:796
 msgid "Cannot specify nonce file when creating a server"
 msgstr "创建服务器时无法指定临时文件"
 
-#: ../gio/gdbusserver.c:882
+#: ../gio/gdbusserver.c:873
 #, c-format
 msgid "Error writing nonce file at `%s': %s"
 msgstr "写入“%s”处的临时文件出错：%s"
 
-#: ../gio/gdbusserver.c:1044
+#: ../gio/gdbusserver.c:1035
 #, c-format
 msgid "The string `%s' is not a valid D-Bus GUID"
 msgstr "字符串“%s”不是有效 D-Bus GUID"
 
-#: ../gio/gdbusserver.c:1084
+#: ../gio/gdbusserver.c:1075
 #, c-format
 msgid "Cannot listen on unsupported transport `%s'"
 msgstr "无法监听不支持的传输 %s"
 
-#: ../gio/gdbus-tool.c:87
+#: ../gio/gdbus-tool.c:88
 msgid "COMMAND"
 msgstr "命令"
 
-#: ../gio/gdbus-tool.c:92
+#: ../gio/gdbus-tool.c:93
 #, c-format
 msgid ""
 "Commands:\n"
@@ -1964,141 +1963,141 @@ msgstr ""
 "\n"
 "使用“%s COMMAND --help”以获得每一个命令的帮助。\n"
 
-#: ../gio/gdbus-tool.c:160 ../gio/gdbus-tool.c:216 ../gio/gdbus-tool.c:288
-#: ../gio/gdbus-tool.c:312 ../gio/gdbus-tool.c:814 ../gio/gdbus-tool.c:1324
+#: ../gio/gdbus-tool.c:161 ../gio/gdbus-tool.c:217 ../gio/gdbus-tool.c:289
+#: ../gio/gdbus-tool.c:313 ../gio/gdbus-tool.c:817 ../gio/gdbus-tool.c:1327
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误：%s\n"
 
-#: ../gio/gdbus-tool.c:171 ../gio/gdbus-tool.c:229 ../gio/gdbus-tool.c:1340
+#: ../gio/gdbus-tool.c:172 ../gio/gdbus-tool.c:230 ../gio/gdbus-tool.c:1343
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "解析 Introspection XML 时出错：%s\n"
 
-#: ../gio/gdbus-tool.c:346
+#: ../gio/gdbus-tool.c:347
 msgid "Connect to the system bus"
 msgstr "连接到系统总线"
 
-#: ../gio/gdbus-tool.c:347
+#: ../gio/gdbus-tool.c:348
 msgid "Connect to the session bus"
 msgstr "连接到会话总线"
 
-#: ../gio/gdbus-tool.c:348
+#: ../gio/gdbus-tool.c:349
 msgid "Connect to given D-Bus address"
 msgstr "连接到给定的 D-Bus 地址"
 
-#: ../gio/gdbus-tool.c:358
+#: ../gio/gdbus-tool.c:359
 msgid "Connection Endpoint Options:"
 msgstr "连接端点选项："
 
-#: ../gio/gdbus-tool.c:359
+#: ../gio/gdbus-tool.c:360
 msgid "Options specifying the connection endpoint"
 msgstr "指定连接端点的选项"
 
-#: ../gio/gdbus-tool.c:379
+#: ../gio/gdbus-tool.c:382
 #, c-format
 msgid "No connection endpoint specified"
 msgstr "没有指定连接的端点"
 
-#: ../gio/gdbus-tool.c:389
+#: ../gio/gdbus-tool.c:392
 #, c-format
 msgid "Multiple connection endpoints specified"
 msgstr "指定了多个连接端点"
 
-#: ../gio/gdbus-tool.c:459
+#: ../gio/gdbus-tool.c:462
 #, c-format
 msgid ""
 "Warning: According to introspection data, interface `%s' does not exist\n"
 msgstr "警告：根据 Introspection 数据，接口“%s”不存在\n"
 
-#: ../gio/gdbus-tool.c:468
+#: ../gio/gdbus-tool.c:471
 #, c-format
 msgid ""
 "Warning: According to introspection data, method `%s' does not exist on "
 "interface `%s'\n"
 msgstr "警告：根据 Introspection 数据，在接口“%s”中方法“%s”不存在\n"
 
-#: ../gio/gdbus-tool.c:530
+#: ../gio/gdbus-tool.c:533
 msgid "Destination name to invoke method on"
 msgstr "调用方法的目标名称"
 
-#: ../gio/gdbus-tool.c:531
+#: ../gio/gdbus-tool.c:534
 msgid "Object path to invoke method on"
 msgstr "调用方法的对象路径"
 
-#: ../gio/gdbus-tool.c:532
+#: ../gio/gdbus-tool.c:535
 msgid "Method and interface name"
 msgstr "方法和接口名称"
 
-#: ../gio/gdbus-tool.c:571
+#: ../gio/gdbus-tool.c:574
 msgid "Invoke a method on a remote object."
 msgstr "在远程对象上调用一个方法。"
 
-#: ../gio/gdbus-tool.c:626 ../gio/gdbus-tool.c:1245 ../gio/gdbus-tool.c:1505
+#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:1248 ../gio/gdbus-tool.c:1508
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "连接时出错：%s\n"
 
-#: ../gio/gdbus-tool.c:646 ../gio/gdbus-tool.c:1264 ../gio/gdbus-tool.c:1524
+#: ../gio/gdbus-tool.c:649 ../gio/gdbus-tool.c:1267 ../gio/gdbus-tool.c:1527
 #, c-format
 msgid "Error: Destination is not specified\n"
 msgstr "错误：没有指定目标\n"
 
-#: ../gio/gdbus-tool.c:667 ../gio/gdbus-tool.c:1283
+#: ../gio/gdbus-tool.c:670 ../gio/gdbus-tool.c:1286
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "错误：没有指定目标路径\n"
 
-#: ../gio/gdbus-tool.c:687 ../gio/gdbus-tool.c:1303 ../gio/gdbus-tool.c:1564
+#: ../gio/gdbus-tool.c:690 ../gio/gdbus-tool.c:1306 ../gio/gdbus-tool.c:1567
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "错误：%s 不是有效的对象路径\n"
 
-#: ../gio/gdbus-tool.c:702
+#: ../gio/gdbus-tool.c:705
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "错误：方法名没有指定\n"
 
-#: ../gio/gdbus-tool.c:713
+#: ../gio/gdbus-tool.c:716
 #, c-format
 msgid "Error: Method name `%s' is invalid\n"
 msgstr "错误：方法名“%s”无效\n"
 
-#: ../gio/gdbus-tool.c:778
+#: ../gio/gdbus-tool.c:781
 #, c-format
 msgid "Error parsing parameter %d of type `%s': %s\n"
 msgstr "解析 %2$s 类型的参数 %1$d 时发生错误：%3$s\n"
 
-#: ../gio/gdbus-tool.c:786
+#: ../gio/gdbus-tool.c:789
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "解析第 %d 个选项出错：%s\n"
 
-#: ../gio/gdbus-tool.c:1162
+#: ../gio/gdbus-tool.c:1165
 msgid "Destination name to introspect"
 msgstr "要 Introspect 的目标名"
 
-#: ../gio/gdbus-tool.c:1163
+#: ../gio/gdbus-tool.c:1166
 msgid "Object path to introspect"
 msgstr "要 Introspect 的对象路径"
 
-#: ../gio/gdbus-tool.c:1164
+#: ../gio/gdbus-tool.c:1167
 msgid "Print XML"
 msgstr "输出 XML"
 
-#: ../gio/gdbus-tool.c:1197
+#: ../gio/gdbus-tool.c:1200
 msgid "Introspect a remote object."
 msgstr "Introspect 远程对象。"
 
-#: ../gio/gdbus-tool.c:1423
+#: ../gio/gdbus-tool.c:1426
 msgid "Destination name to monitor"
 msgstr "要监视的目标"
 
-#: ../gio/gdbus-tool.c:1424
+#: ../gio/gdbus-tool.c:1427
 msgid "Object path to monitor"
 msgstr "要监视的对象路径"
 
-#: ../gio/gdbus-tool.c:1457
+#: ../gio/gdbus-tool.c:1460
 msgid "Monitor a remote object."
 msgstr "监视一个远程对象。"
 
@@ -2579,7 +2578,7 @@ msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled 文件存储于何处"
 
-#: ../gio/glib-compile-schemas.c:1897 ../gio/glib-compile-schemas.c:1910
+#: ../gio/glib-compile-schemas.c:1897 ../gio/glib-compile-schemas.c:1923
 msgid "DIRECTORY"
 msgstr "目录"
 
@@ -2599,7 +2598,7 @@ msgstr "此选项将在不久删除。"
 msgid "Do not enforce key name restrictions"
 msgstr "不要强制键名的限制"
 
-#: ../gio/glib-compile-schemas.c:1913
+#: ../gio/glib-compile-schemas.c:1926
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -2609,22 +2608,22 @@ msgstr ""
 "要使用扩展 .gschema.xml，需要有方案文件，\n"
 "缓存文件被称为 gschemas.compiled。"
 
-#: ../gio/glib-compile-schemas.c:1929
+#: ../gio/glib-compile-schemas.c:1942
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "您应该给出且只能给出一个目录名\n"
 
-#: ../gio/glib-compile-schemas.c:1968
+#: ../gio/glib-compile-schemas.c:1981
 #, c-format
 msgid "No schema files found: "
 msgstr "没有找到方案文件："
 
-#: ../gio/glib-compile-schemas.c:1971
+#: ../gio/glib-compile-schemas.c:1984
 #, c-format
 msgid "doing nothing.\n"
 msgstr "什么都没做。\n"
 
-#: ../gio/glib-compile-schemas.c:1974
+#: ../gio/glib-compile-schemas.c:1987
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "已删除存在的输出文件。\n"
@@ -3072,70 +3071,76 @@ msgstr "路径中不能包含连续两个斜杠(//)\n"
 msgid "No such key '%s'\n"
 msgstr "没有“%s”这个键\n"
 
-#: ../gio/gsettings-tool.c:429
+#: ../gio/gsettings-tool.c:444
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "提供的值不在有效范围内\n"
 
-#: ../gio/gsettings-tool.c:458
+#: ../gio/gsettings-tool.c:473
 msgid "Print help"
 msgstr "打印帮助"
 
-#: ../gio/gsettings-tool.c:464
+#: ../gio/gsettings-tool.c:479
 msgid "List the installed (non-relocatable) schemas"
 msgstr "列出安装的(不可重定向的)方案"
 
-#: ../gio/gsettings-tool.c:470
+#: ../gio/gsettings-tool.c:485
 msgid "List the installed relocatable schemas"
 msgstr "列出安装的可重定向方案"
 
-#: ../gio/gsettings-tool.c:476
+#: ../gio/gsettings-tool.c:491
 msgid "List the keys in SCHEMA"
 msgstr "列出 SCHEMA 中的键"
 
-#: ../gio/gsettings-tool.c:477 ../gio/gsettings-tool.c:483
-#: ../gio/gsettings-tool.c:489
+#: ../gio/gsettings-tool.c:492 ../gio/gsettings-tool.c:498
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:482
+#: ../gio/gsettings-tool.c:497
 msgid "List the children of SCHEMA"
 msgstr "列出 SCHEMA 的子对象"
 
-#: ../gio/gsettings-tool.c:488
-msgid "List keys and values, recursively"
-msgstr "递归列表项和值"
+#: ../gio/gsettings-tool.c:503
+msgid ""
+"List keys and values, recursively\n"
+"If no SCHEMA is given, list all keys\n"
+msgstr "递归列出键和值\n"
+"如果没有给出 SCHEMA，列出所有键\n"
 
-#: ../gio/gsettings-tool.c:494
+#: ../gio/gsettings-tool.c:505
+msgid "[SCHEMA[:PATH]]"
+msgstr "SCHEMA[:PATH]"
+
+#: ../gio/gsettings-tool.c:510
 msgid "Get the value of KEY"
 msgstr "获取 KEY 的值"
 
-#: ../gio/gsettings-tool.c:495 ../gio/gsettings-tool.c:501
-#: ../gio/gsettings-tool.c:513 ../gio/gsettings-tool.c:519
+#: ../gio/gsettings-tool.c:511 ../gio/gsettings-tool.c:517
+#: ../gio/gsettings-tool.c:529 ../gio/gsettings-tool.c:535
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMA[:PATH] KEY"
 
-#: ../gio/gsettings-tool.c:500
+#: ../gio/gsettings-tool.c:516
 msgid "Query the range of valid values for KEY"
 msgstr "查询 KEY 的有效值范围"
 
-#: ../gio/gsettings-tool.c:506
+#: ../gio/gsettings-tool.c:522
 msgid "Set the value of KEY to VALUE"
 msgstr "将 KEY 的值设为 VALUE"
 
-#: ../gio/gsettings-tool.c:507
+#: ../gio/gsettings-tool.c:523
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:PATH] KEY VALUE"
 
-#: ../gio/gsettings-tool.c:512
+#: ../gio/gsettings-tool.c:528
 msgid "Reset KEY to its default value"
 msgstr "将 KEY 重设为默认值"
 
-#: ../gio/gsettings-tool.c:518
+#: ../gio/gsettings-tool.c:534
 msgid "Check if KEY is writable"
 msgstr "查看 KEY 是否可写"
 
-#: ../gio/gsettings-tool.c:524
+#: ../gio/gsettings-tool.c:540
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -3145,11 +3150,11 @@ msgstr ""
 "如果没有指定 KEY，则监视 SCHEMA 中的所有键。\n"
 "使用 ^C 停止监视。\n"
 
-#: ../gio/gsettings-tool.c:527
+#: ../gio/gsettings-tool.c:543
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:PATH] [KEY]"
 
-#: ../gio/gsettings-tool.c:531
+#: ../gio/gsettings-tool.c:547
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -3158,7 +3163,7 @@ msgstr ""
 "未知命令 %s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:539
+#: ../gio/gsettings-tool.c:555
 msgid ""
 "Usage:\n"
 "  gsettings COMMAND [ARGS...]\n"
@@ -3200,7 +3205,7 @@ msgstr ""
 "使用 'gsettings help 命令' 查询详细的帮助。\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:560
+#: ../gio/gsettings-tool.c:576
 #, c-format
 msgid ""
 "Usage:\n"
@@ -3215,15 +3220,15 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:565
+#: ../gio/gsettings-tool.c:581
 msgid "Arguments:\n"
 msgstr "参数：\n"
 
-#: ../gio/gsettings-tool.c:569
+#: ../gio/gsettings-tool.c:585
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMMAND   要解释的命令(可选)\n"
 
-#: ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:589
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -3231,23 +3236,22 @@ msgstr ""
 "  SCHEMA    方案的名称\n"
 "  PATH      可重定向方案的路径\n"
 
-#: ../gio/gsettings-tool.c:578
+#: ../gio/gsettings-tool.c:594
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KEY       方案中(可选)的键\n"
 
-#: ../gio/gsettings-tool.c:582
+#: ../gio/gsettings-tool.c:598
 msgid "  KEY       The key within the schema\n"
 msgstr "  KEY       方案中的键\n"
 
-#: ../gio/gsettings-tool.c:586
+#: ../gio/gsettings-tool.c:602
 msgid "  VALUE     The value to set\n"
 msgstr "  VALUE     要设的值\n"
 
-#: ../gio/gsettings-tool.c:662
+#: ../gio/gsettings-tool.c:691
 #, c-format
-#| msgid "Empty schema name given\n"
-msgid "Empty schema name given"
-msgstr "给出的方案名称"
+msgid "Empty schema name given\n"
+msgstr "给出了空的大纲名称\n"
 
 #: ../gio/gsocket.c:277
 msgid "Invalid socket, not initialized"
@@ -3620,7 +3624,3 @@ msgstr "需要更多输入"
 #: ../gio/gzlibdecompressor.c:342
 msgid "Invalid compressed data"
 msgstr "无效的压缩数据"
-
-#~| msgid "SCHEMA[:PATH]"
-#~ msgid "[SCHEMA[:PATH]]"
-#~ msgstr "SCHEMA[:PATH]"