Update Chinese (China) translation
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8bc2d37..117c3ff 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1,5 +1,5 @@
-# glib simplified chinese translation
-# Copyright (C) 2009, 2010 Free Software Foundation, Inc.
+# Chinese (China) translation for glib.
+# Copyright (C) 2001-2017 glib's COPYRIGHT HOLDER
# This file is distributed under the same license as the glib package.
# He Qiangqiang <carton@263.net>, 2001.
# Funda Wang <fundawang@linux.net.cn>, 2004, 2005.
@@ -21,39 +21,39 @@
#
msgid ""
msgstr ""
-"Project-Id-Version: glib master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"Project-Id-Version: glib 2.54\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"
"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-12-07 20:45+0000\n"
-"PO-Revision-Date: 2017-02-09 14:57+0800\n"
-"Last-Translator: Mandy Wang <wangmychn@gmail.com>\n"
-"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2017-10-27 11:19+0000\n"
+"PO-Revision-Date: 2017-06-09 23:47+0800\n"
+"Last-Translator: liushuyu <liushuyu011@gmail.com>\n"
+"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.11\n"
+"X-Generator: Poedit 2.0.1\n"
-#: ../gio/gapplication.c:493
+#: ../gio/gapplication.c:490
msgid "GApplication options"
msgstr "GApplication 选项"
-#: ../gio/gapplication.c:493
+#: ../gio/gapplication.c:490
msgid "Show GApplication options"
msgstr "显示 GApplication 选项"
-#: ../gio/gapplication.c:538
+#: ../gio/gapplication.c:535
msgid "Enter GApplication service mode (use from D-Bus service files)"
msgstr "进入 GApplication 服务模式(从 D-Bus 服务文件中调用)"
-#: ../gio/gapplication.c:550
-msgid "Override the application's ID"
+#: ../gio/gapplication.c:547
+msgid "Override the application’s ID"
msgstr "覆盖应用程序 ID"
#: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
-#: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488
-#: ../gio/gsettings-tool.c:520
+#: ../gio/gio-tool.c:227 ../gio/gresource-tool.c:488
+#: ../gio/gsettings-tool.c:522
msgid "Print help"
msgstr "打印帮助"
@@ -62,11 +62,11 @@
msgid "[COMMAND]"
msgstr "[COMMAND]"
-#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:210
+#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:228
msgid "Print version"
msgstr "打印版本"
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:526
+#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:528
msgid "Print version information and exit"
msgstr "打印版本信息并退出"
@@ -87,7 +87,7 @@
msgstr "启动应用程序(可选打开文件)"
#: ../gio/gapplication-tool.c:57
-msgid "APPID [FILE...]"
+msgid "APPID [FILE…]"
msgstr "APPID [FILE...]"
#: ../gio/gapplication-tool.c:59
@@ -115,7 +115,7 @@
msgstr "APPID"
#: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
-#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:206
+#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:224
msgid "COMMAND"
msgstr "COMMAND"
@@ -127,8 +127,8 @@
msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
msgstr "D-Bus 格式的应用标识符(比如：org.example.viewer)"
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
-#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:671 ../gio/glib-compile-resources.c:698
#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
msgid "FILE"
msgstr "FILE"
@@ -154,7 +154,7 @@
msgstr "可选的动作调用参数，GVariant 格式"
#: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:612
+#: ../gio/gsettings-tool.c:614
#, c-format
msgid ""
"Unknown command %s\n"
@@ -168,13 +168,13 @@
msgstr "用法：\n"
#: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:647
+#: ../gio/gsettings-tool.c:649
msgid "Arguments:\n"
msgstr "参数：\n"
-#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206
-msgid "[ARGS...]"
-msgstr "[ARGS...]"
+#: ../gio/gapplication-tool.c:133
+msgid "[ARGS…]"
+msgstr "[参数...]"
#: ../gio/gapplication-tool.c:134
#, c-format
@@ -185,7 +185,7 @@
#: ../gio/gapplication-tool.c:146
#, c-format
msgid ""
-"Use '%s help COMMAND' to get detailed help.\n"
+"Use “%s help COMMAND” to get detailed help.\n"
"\n"
msgstr ""
"使用“%s help COMMAND”获取详细帮助\n"
@@ -202,14 +202,14 @@
#: ../gio/gapplication-tool.c:171
#, c-format
-msgid "invalid application id: '%s'\n"
+msgid "invalid application id: “%s”\n"
msgstr "无效的应用程序 ID：“%s”\n"
#. Translators: %s is replaced with a command name like 'list-actions'
#: ../gio/gapplication-tool.c:182
#, c-format
msgid ""
-"'%s' takes no arguments\n"
+"“%s” takes no arguments\n"
"\n"
msgstr ""
"“%s”无参数\n"
@@ -233,8 +233,8 @@
#: ../gio/gapplication-tool.c:325
#, c-format
msgid ""
-"invalid action name: '%s'\n"
-"action names must consist of only alphanumerics, '-' and '.'\n"
+"invalid action name: “%s”\n"
+"action names must consist of only alphanumerics, “-” and “.”\n"
msgstr ""
"非法动作名：“%s”\n"
"动作名只能由字母数字、'-' 和 '.' 组成。\n"
@@ -296,8 +296,8 @@
msgstr "基流(base stream)不支持截断"
#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
-#: ../gio/gdbusprivate.c:1377 ../gio/gsimpleasyncresult.c:870
-#: ../gio/gsimpleasyncresult.c:896
+#: ../gio/gdbusprivate.c:1402 ../gio/gsimpleasyncresult.c:871
+#: ../gio/gsimpleasyncresult.c:897
#, c-format
msgid "Operation was cancelled"
msgstr "操作被取消"
@@ -316,42 +316,42 @@
#: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845
-#: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598
-#: ../glib/giochannel.c:2442 ../glib/gutf8.c:855 ../glib/gutf8.c:1308
+#: ../glib/giochannel.c:1557 ../glib/giochannel.c:1599
+#: ../glib/giochannel.c:2443 ../glib/gutf8.c:866 ../glib/gutf8.c:1319
msgid "Invalid byte sequence in conversion input"
msgstr "转换输入中出现无效字符序列"
#: ../gio/gcharsetconverter.c:347 ../glib/gconvert.c:446 ../glib/gconvert.c:770
-#: ../glib/giochannel.c:1563 ../glib/giochannel.c:2454
+#: ../glib/giochannel.c:1564 ../glib/giochannel.c:2455
#, c-format
msgid "Error during conversion: %s"
msgstr "转换过程中出错：%s"
-#: ../gio/gcharsetconverter.c:444 ../gio/gsocket.c:1078
+#: ../gio/gcharsetconverter.c:445 ../gio/gsocket.c:1101
msgid "Cancellable initialization not supported"
msgstr "不支持可撤销的初始化"
-#: ../gio/gcharsetconverter.c:454 ../glib/gconvert.c:321
-#: ../glib/giochannel.c:1384
+#: ../gio/gcharsetconverter.c:456 ../glib/gconvert.c:321
+#: ../glib/giochannel.c:1385
#, c-format
-msgid "Conversion from character set '%s' to '%s' is not supported"
+msgid "Conversion from character set “%s” to “%s” is not supported"
msgstr "不支持从字符集“%s”到“%s”的转换"
-#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:325
+#: ../gio/gcharsetconverter.c:460 ../glib/gconvert.c:325
#, c-format
-msgid "Could not open converter from '%s' to '%s'"
+msgid "Could not open converter from “%s” to “%s”"
msgstr "无法打开从“%s”到“%s”的转换器"
-#: ../gio/gcontenttype.c:335
+#: ../gio/gcontenttype.c:358
#, c-format
msgid "%s type"
msgstr "%s 类型"
-#: ../gio/gcontenttype-win32.c:160
+#: ../gio/gcontenttype-win32.c:177
msgid "Unknown type"
msgstr "未知类型"
-#: ../gio/gcontenttype-win32.c:162
+#: ../gio/gcontenttype-win32.c:179
#, c-format
msgid "%s filetype"
msgstr "%s 文件类型"
@@ -376,155 +376,155 @@
msgid "Unexpected early end-of-stream"
msgstr "非预期的过早的流结束符"
-#: ../gio/gdbusaddress.c:153 ../gio/gdbusaddress.c:241
-#: ../gio/gdbusaddress.c:322
+#: ../gio/gdbusaddress.c:155 ../gio/gdbusaddress.c:243
+#: ../gio/gdbusaddress.c:324
#, c-format
-msgid "Unsupported key '%s' in address entry '%s'"
+msgid "Unsupported key “%s” in address entry “%s”"
msgstr "地址条目“%2$s”中不支持的键“%1$s”"
-#: ../gio/gdbusaddress.c:180
+#: ../gio/gdbusaddress.c:182
#, c-format
msgid ""
-"Address '%s' is invalid (need exactly one of path, tmpdir or abstract keys)"
-msgstr "地址 %s 无效(需要指定的一个路径、临时目录或抽象键)"
+"Address “%s” is invalid (need exactly one of path, tmpdir or abstract keys)"
+msgstr "地址 “%s” 无效(需要指定的一个路径、临时目录或抽象键)"
-#: ../gio/gdbusaddress.c:193
+#: ../gio/gdbusaddress.c:195
#, c-format
-msgid "Meaningless key/value pair combination in address entry '%s'"
+msgid "Meaningless key/value pair combination in address entry “%s”"
msgstr "地址条目“%s”中无意义的键/值对组合"
-#: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
+#: ../gio/gdbusaddress.c:258 ../gio/gdbusaddress.c:339
#, c-format
-msgid "Error in address '%s' - the port attribute is malformed"
+msgid "Error in address “%s” — the port attribute is malformed"
msgstr "地址“%s”中有错误 - 端口属性格式错误"
-#: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
+#: ../gio/gdbusaddress.c:269 ../gio/gdbusaddress.c:350
#, c-format
-msgid "Error in address '%s' - the family attribute is malformed"
+msgid "Error in address “%s” — the family attribute is malformed"
msgstr "地址“%s”中有错误 - 协议族属性格式错误"
-#: ../gio/gdbusaddress.c:457
+#: ../gio/gdbusaddress.c:460
#, c-format
-msgid "Address element '%s' does not contain a colon (:)"
+msgid "Address element “%s” does not contain a colon (:)"
msgstr "地址元素“%s”不包含冒号(:)"
-#: ../gio/gdbusaddress.c:478
+#: ../gio/gdbusaddress.c:481
#, c-format
msgid ""
-"Key/Value pair %d, '%s', in address element '%s' does not contain an equal "
+"Key/Value pair %d, “%s”, in address element “%s” does not contain an equal "
"sign"
msgstr "地址元素“%3$s”中的第 %1$d 个键/值对 “%2$s”，不包含等号"
-#: ../gio/gdbusaddress.c:492
+#: ../gio/gdbusaddress.c:495
#, c-format
msgid ""
-"Error unescaping key or value in Key/Value pair %d, '%s', in address element "
-"'%s'"
+"Error unescaping key or value in Key/Value pair %d, “%s”, in address element "
+"“%s”"
msgstr "在地址元素“%3$s”中，对键/值对 %1$d、“%2$s”取消转义键或值时出错"
-#: ../gio/gdbusaddress.c:570
+#: ../gio/gdbusaddress.c:573
#, c-format
msgid ""
-"Error in address '%s' - the unix transport requires exactly one of the keys "
-"'path' or 'abstract' to be set"
-msgstr "地址 %s 中有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置。"
+"Error in address “%s” — the unix transport requires exactly one of the keys "
+"“path” or “abstract” to be set"
+msgstr "地址 %s 中有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置"
-#: ../gio/gdbusaddress.c:606
+#: ../gio/gdbusaddress.c:609
#, c-format
-msgid "Error in address '%s' - the host attribute is missing or malformed"
+msgid "Error in address “%s” — the host attribute is missing or malformed"
msgstr "地址“%s”中有错误 - 主机属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:620
+#: ../gio/gdbusaddress.c:623
#, c-format
-msgid "Error in address '%s' - the port attribute is missing or malformed"
+msgid "Error in address “%s” — the port attribute is missing or malformed"
msgstr "地址“%s”中有错误 - 端口属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:634
+#: ../gio/gdbusaddress.c:637
#, c-format
-msgid "Error in address '%s' - the noncefile attribute is missing or malformed"
-msgstr "地址“%s”中有错误 - 临时文件属性丢失或格式错误"
+msgid "Error in address “%s” — the noncefile attribute is missing or malformed"
+msgstr "地址“%s”中有错误 — 临时文件属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:655
+#: ../gio/gdbusaddress.c:658
msgid "Error auto-launching: "
msgstr "自启动出错："
-#: ../gio/gdbusaddress.c:663
+#: ../gio/gdbusaddress.c:666
#, c-format
-msgid "Unknown or unsupported transport '%s' for address '%s'"
-msgstr "对地址 %2$s 的未知或不支持的传输 %1$s"
+msgid "Unknown or unsupported transport “%s” for address “%s”"
+msgstr "对地址“%2$s”的未知或不支持的传输“%1$s”"
-#: ../gio/gdbusaddress.c:699
+#: ../gio/gdbusaddress.c:704
#, c-format
-msgid "Error opening nonce file '%s': %s"
-msgstr "打开临时文件“%s”时出错：%s"
+msgid "Error opening nonce file “%s”: %s"
+msgstr "打开临时文件“%s”出错：%s"
-#: ../gio/gdbusaddress.c:717
+#: ../gio/gdbusaddress.c:723
#, c-format
-msgid "Error reading from nonce file '%s': %s"
+msgid "Error reading from nonce file “%s”: %s"
msgstr "读取临时文件“%s”时出错：%s"
-#: ../gio/gdbusaddress.c:726
+#: ../gio/gdbusaddress.c:732
#, c-format
-msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
+msgid "Error reading from nonce file “%s”, expected 16 bytes, got %d"
msgstr "读取临时文件“%s”时出错，预计 16 个字节，得到 %d 个字节"
-#: ../gio/gdbusaddress.c:744
+#: ../gio/gdbusaddress.c:750
#, c-format
-msgid "Error writing contents of nonce file '%s' to stream:"
+msgid "Error writing contents of nonce file “%s” to stream:"
msgstr "写入临时文件 %s 的内容到流的过程中出错："
-#: ../gio/gdbusaddress.c:951
+#: ../gio/gdbusaddress.c:959
msgid "The given address is empty"
msgstr "给出的地址为空"
-#: ../gio/gdbusaddress.c:1064
+#: ../gio/gdbusaddress.c:1072
#, c-format
msgid "Cannot spawn a message bus when setuid"
msgstr "无法在 setuid 时启动一条消息总线"
-#: ../gio/gdbusaddress.c:1071
+#: ../gio/gdbusaddress.c:1079
msgid "Cannot spawn a message bus without a machine-id: "
msgstr "无法在无机器 ID 时启动一条消息总线："
-#: ../gio/gdbusaddress.c:1078
+#: ../gio/gdbusaddress.c:1086
#, c-format
msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
msgstr "无法在没有 X11 $DISPLAY 的情况下自动启动 D-Bus"
-#: ../gio/gdbusaddress.c:1120
+#: ../gio/gdbusaddress.c:1128
#, c-format
-msgid "Error spawning command line '%s': "
+msgid "Error spawning command line “%s”: "
msgstr "生成并运行命令行 %s 时出错："
-#: ../gio/gdbusaddress.c:1337
+#: ../gio/gdbusaddress.c:1345
#, c-format
msgid "(Type any character to close this window)\n"
msgstr "(按任意键关闭本窗口)\n"
-#: ../gio/gdbusaddress.c:1489
+#: ../gio/gdbusaddress.c:1499
#, c-format
msgid "Session dbus not running, and autolaunch failed"
msgstr "dbus 会话未运行，自动启动失败"
-#: ../gio/gdbusaddress.c:1500
+#: ../gio/gdbusaddress.c:1510
#, c-format
msgid "Cannot determine session bus address (not implemented for this OS)"
msgstr "无法确定会话总线地址(尚未在此操作系统上实现)"
-#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
+#: ../gio/gdbusaddress.c:1648
#, c-format
msgid ""
"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
-"- unknown value '%s'"
-msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
+"— unknown value “%s”"
+msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 — 未知的值“%s”"
-#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
+#: ../gio/gdbusaddress.c:1657 ../gio/gdbusconnection.c:7155
msgid ""
"Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
"variable is not set"
msgstr "无法确定总线地址，因为环境变量 DBUS_STARTER_BUS_TYPE 未设置"
-#: ../gio/gdbusaddress.c:1654
+#: ../gio/gdbusaddress.c:1667
#, c-format
msgid "Unknown bus type %d"
msgstr "未知的总线类型 %d"
@@ -543,84 +543,84 @@
"Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
msgstr "用尽了所有可用的认证机制(已尝试：%s)(可用的：%s)"
-#: ../gio/gdbusauth.c:1173
+#: ../gio/gdbusauth.c:1171
msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消"
-#: ../gio/gdbusauthmechanismsha1.c:261
+#: ../gio/gdbusauthmechanismsha1.c:262
#, c-format
-msgid "Error when getting information for directory '%s': %s"
+msgid "Error when getting information for directory “%s”: %s"
msgstr "获取目录“%s”信息时发生错误：%s"
-#: ../gio/gdbusauthmechanismsha1.c:273
+#: ../gio/gdbusauthmechanismsha1.c:274
#, c-format
msgid ""
-"Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
+"Permissions on directory “%s” are malformed. Expected mode 0700, got 0%o"
msgstr "目录“%s”权限错误。期望 0700，得到 0%o"
-#: ../gio/gdbusauthmechanismsha1.c:294
+#: ../gio/gdbusauthmechanismsha1.c:296
#, c-format
-msgid "Error creating directory '%s': %s"
-msgstr "创建目录“%s”时出错：%s"
+msgid "Error creating directory “%s”: %s"
+msgstr "创建目录“%s”出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:377
+#: ../gio/gdbusauthmechanismsha1.c:379
#, c-format
-msgid "Error opening keyring '%s' for reading: "
+msgid "Error opening keyring “%s” for reading: "
msgstr "打开密钥环“%s”读取时出错："
-#: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
+#: ../gio/gdbusauthmechanismsha1.c:402 ../gio/gdbusauthmechanismsha1.c:720
#, c-format
-msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
+msgid "Line %d of the keyring at “%s” with content “%s” is malformed"
msgstr "“%2$s”处的密钥环的 %1$d 行有不符合格式的内容“%3$s”"
-#: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
+#: ../gio/gdbusauthmechanismsha1.c:416 ../gio/gdbusauthmechanismsha1.c:734
#, c-format
msgid ""
-"First token of line %d of the keyring at '%s' with content '%s' is malformed"
+"First token of line %d of the keyring at “%s” with content “%s” is malformed"
msgstr "“%2$s”处的密钥环的 %1$d 行第一个令牌有不符合格式的内容“%3$s”"
-#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
+#: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:748
#, c-format
msgid ""
-"Second token of line %d of the keyring at '%s' with content '%s' is malformed"
+"Second token of line %d of the keyring at “%s” with content “%s” is malformed"
msgstr "“%2$s”处的密钥环的 %1$d 行第二个令牌有不符合格式的内容“%3$s”"
#: ../gio/gdbusauthmechanismsha1.c:454
#, c-format
-msgid "Didn't find cookie with id %d in the keyring at '%s'"
+msgid "Didn’t find cookie with id %d in the keyring at “%s”"
msgstr "未在“%2$s”处的密钥环中找到 ID 为 %1$d 的 cookie"
-#: ../gio/gdbusauthmechanismsha1.c:532
+#: ../gio/gdbusauthmechanismsha1.c:536
#, c-format
-msgid "Error deleting stale lock file '%s': %s"
+msgid "Error deleting stale lock file “%s”: %s"
msgstr "删除失效的锁文件“%s”时出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:564
+#: ../gio/gdbusauthmechanismsha1.c:568
#, c-format
-msgid "Error creating lock file '%s': %s"
+msgid "Error creating lock file “%s”: %s"
msgstr "创建锁文件“%s”时出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:594
+#: ../gio/gdbusauthmechanismsha1.c:599
#, c-format
-msgid "Error closing (unlinked) lock file '%s': %s"
+msgid "Error closing (unlinked) lock file “%s”: %s"
msgstr "关闭(已删除的)锁文件“%s”时出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:604
+#: ../gio/gdbusauthmechanismsha1.c:610
#, c-format
-msgid "Error unlinking lock file '%s': %s"
+msgid "Error unlinking lock file “%s”: %s"
msgstr "删除锁文件“%s”时出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:681
+#: ../gio/gdbusauthmechanismsha1.c:687
#, c-format
-msgid "Error opening keyring '%s' for writing: "
+msgid "Error opening keyring “%s” for writing: "
msgstr "打开钥匙环“%s”以写入时出错："
-#: ../gio/gdbusauthmechanismsha1.c:878
+#: ../gio/gdbusauthmechanismsha1.c:883
#, c-format
-msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
-msgstr "(此外，释放 %s 的锁失败：%s)"
+msgid "(Additionally, releasing the lock for “%s” also failed: %s) "
+msgstr "(此外，释放 %s 的锁也失败：%s)"
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377
+#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2378
msgid "The connection is closed"
msgstr "连接已关闭"
@@ -628,154 +628,158 @@
msgid "Timeout was reached"
msgstr "已到超时限制"
-#: ../gio/gdbusconnection.c:2499
+#: ../gio/gdbusconnection.c:2500
msgid ""
"Unsupported flags encountered when constructing a client-side connection"
msgstr "构建客户端连接时遇到不支持的标志"
-#: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456
+#: ../gio/gdbusconnection.c:4124 ../gio/gdbusconnection.c:4471
#, c-format
msgid ""
"No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
msgstr "路径 %s 的对象上没有 org.freedesktop.DBus.Properties 接口"
-#: ../gio/gdbusconnection.c:4251
+#: ../gio/gdbusconnection.c:4266
#, c-format
msgid "No such property '%s'"
msgstr "无此属性：%s"
-#: ../gio/gdbusconnection.c:4263
+#: ../gio/gdbusconnection.c:4278
#, c-format
msgid "Property '%s' is not readable"
msgstr "属性 %s 不可读"
-#: ../gio/gdbusconnection.c:4274
+#: ../gio/gdbusconnection.c:4289
#, c-format
msgid "Property '%s' is not writable"
msgstr "属性 %s 不可写"
-#: ../gio/gdbusconnection.c:4294
+#: ../gio/gdbusconnection.c:4309
#, c-format
msgid "Error setting property '%s': Expected type '%s' but got '%s'"
msgstr "设置属性 %s 出错：期望 %s 类型但得到 %s 类型"
-#: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573
+#: ../gio/gdbusconnection.c:4414 ../gio/gdbusconnection.c:4622
+#: ../gio/gdbusconnection.c:6586
#, c-format
msgid "No such interface '%s'"
msgstr "无此接口：%s"
-#: ../gio/gdbusconnection.c:4607
-msgid "No such interface"
-msgstr "无此接口"
-
-#: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082
+#: ../gio/gdbusconnection.c:4840 ../gio/gdbusconnection.c:7095
#, c-format
msgid "No such interface '%s' on object at path %s"
msgstr "在路径 %s 的对象上没有 %s 接口"
-#: ../gio/gdbusconnection.c:4923
+#: ../gio/gdbusconnection.c:4938
#, c-format
msgid "No such method '%s'"
msgstr "无此方法：%s"
-#: ../gio/gdbusconnection.c:4954
+#: ../gio/gdbusconnection.c:4969
#, c-format
msgid "Type of message, '%s', does not match expected type '%s'"
msgstr "消息的类型“%s”，与预期的类型“%s”不匹配"
-#: ../gio/gdbusconnection.c:5152
+#: ../gio/gdbusconnection.c:5167
#, c-format
msgid "An object is already exported for the interface %s at %s"
msgstr "%2$s 处的接口 %1$s 已经导出了一个对象"
-#: ../gio/gdbusconnection.c:5378
+#: ../gio/gdbusconnection.c:5393
#, c-format
msgid "Unable to retrieve property %s.%s"
msgstr "无法接收属性 %s：%s"
-#: ../gio/gdbusconnection.c:5434
+#: ../gio/gdbusconnection.c:5449
#, c-format
msgid "Unable to set property %s.%s"
msgstr "无法设置属性 %s：%s"
-#: ../gio/gdbusconnection.c:5610
+#: ../gio/gdbusconnection.c:5625
#, c-format
msgid "Method '%s' returned type '%s', but expected '%s'"
msgstr "方法“%s”返回类型“%s”，但预期的是“%s”"
-#: ../gio/gdbusconnection.c:6684
+#: ../gio/gdbusconnection.c:6697
#, c-format
msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
msgstr "带有 %3$s 签名的接口 %2$s 上不存在 %1$s 方法"
-#: ../gio/gdbusconnection.c:6805
+#: ../gio/gdbusconnection.c:6818
#, c-format
msgid "A subtree is already exported for %s"
msgstr "已经为 %s 导出一个子树"
-#: ../gio/gdbusmessage.c:1244
+#: ../gio/gdbusconnection.c:7146
+#, c-format
+msgid ""
+"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
+"- unknown value '%s'"
+msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
+
+#: ../gio/gdbusmessage.c:1246
msgid "type is INVALID"
msgstr "类型无效"
-#: ../gio/gdbusmessage.c:1255
+#: ../gio/gdbusmessage.c:1257
msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
msgstr "METHOD_CALL 消息：PATH 或 MEMBER 头域缺失"
-#: ../gio/gdbusmessage.c:1266
+#: ../gio/gdbusmessage.c:1268
msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
msgstr "METHOD_CALL 消息：REPLY_SERIAL 头域缺失"
-#: ../gio/gdbusmessage.c:1278
+#: ../gio/gdbusmessage.c:1280
msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
msgstr "错误消息：REPLY_SERIAL 或 ERROR_NAME 头域缺失"
-#: ../gio/gdbusmessage.c:1291
+#: ../gio/gdbusmessage.c:1293
msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
msgstr "信号消息：PATH、INTERFACE 或 MEMBER 头域缺失"
-#: ../gio/gdbusmessage.c:1299
+#: ../gio/gdbusmessage.c:1301
msgid ""
"SIGNAL message: The PATH header field is using the reserved value /org/"
"freedesktop/DBus/Local"
msgstr "信号消息：PATH 头域正在使用保留值 /org/freedesktop/DBus/Local"
-#: ../gio/gdbusmessage.c:1307
+#: ../gio/gdbusmessage.c:1309
msgid ""
"SIGNAL message: The INTERFACE header field is using the reserved value org."
"freedesktop.DBus.Local"
msgstr "信号消息：INTERFACE 头域正在使用保留值 org.freedesktop.DBus.Local"
-#: ../gio/gdbusmessage.c:1355 ../gio/gdbusmessage.c:1415
+#: ../gio/gdbusmessage.c:1357 ../gio/gdbusmessage.c:1417
#, c-format
msgid "Wanted to read %lu byte but only got %lu"
msgid_plural "Wanted to read %lu bytes but only got %lu"
msgstr[0] "期望读取 %lu 个字节但只得到 %lu 个"
-#: ../gio/gdbusmessage.c:1369
+#: ../gio/gdbusmessage.c:1371
#, c-format
-msgid "Expected NUL byte after the string '%s' but found byte %d"
+msgid "Expected NUL byte after the string “%s” but found byte %d"
msgstr "期望“%s”后为 NUL 字节但得到字节 %d"
-#: ../gio/gdbusmessage.c:1388
+#: ../gio/gdbusmessage.c:1390
#, c-format
msgid ""
"Expected valid UTF-8 string but found invalid bytes at byte offset %d "
-"(length of string is %d). The valid UTF-8 string up until that point was '%s'"
+"(length of string is %d). The valid UTF-8 string up until that point was “%s”"
msgstr ""
"期望得到有效的 UTF-8 字符串，但在字节偏移 %d 处(字符串长度为 %d)得到了无效的"
"字节。该点的有效 UTF-8 字符串曾是“%s”。"
-#: ../gio/gdbusmessage.c:1587
+#: ../gio/gdbusmessage.c:1593
#, c-format
-msgid "Parsed value '%s' is not a valid D-Bus object path"
+msgid "Parsed value “%s” is not a valid D-Bus object path"
msgstr "已解析的值“%s”不是有效的 D-Bus 对象路径"
-#: ../gio/gdbusmessage.c:1609
+#: ../gio/gdbusmessage.c:1615
#, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature"
+msgid "Parsed value “%s” is not a valid D-Bus signature"
msgstr "已解析的值“%s”不是有效的 D-Bus 签名"
-#: ../gio/gdbusmessage.c:1656
+#: ../gio/gdbusmessage.c:1662
#, c-format
msgid ""
"Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -783,106 +787,106 @@
"Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)."
msgstr[0] "得到长度为 %u 字节的数组，最大长度应为 2<<26 字节(64 MiB)。"
-#: ../gio/gdbusmessage.c:1676
+#: ../gio/gdbusmessage.c:1682
#, c-format
msgid ""
-"Encountered array of type 'a%c', expected to have a length a multiple of %u "
+"Encountered array of type “a%c”, expected to have a length a multiple of %u "
"bytes, but found to be %u bytes in length"
msgstr ""
-"得到类型为“a%c”的数组，期望长度为 %u 字节的倍数，但是得到长度为 %u 字节。"
+"得到类型为“a%c”的数组，需要长度为 %u 字节的倍数，但是得到长度为 %u 字节。"
-#: ../gio/gdbusmessage.c:1843
+#: ../gio/gdbusmessage.c:1849
#, c-format
-msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
+msgid "Parsed value “%s” for variant is not a valid D-Bus signature"
msgstr "已解析的衍生属性值“%s”不是有效的 D-Bus 签名"
-#: ../gio/gdbusmessage.c:1867
+#: ../gio/gdbusmessage.c:1873
#, c-format
msgid ""
-"Error deserializing GVariant with type string '%s' from the D-Bus wire format"
+"Error deserializing GVariant with type string “%s” from the D-Bus wire format"
msgstr "在以 D-Bus 线格式用类型字符串“%s”反序列化 GVariant 时发生错误"
-#: ../gio/gdbusmessage.c:2051
+#: ../gio/gdbusmessage.c:2055
#, c-format
msgid ""
-"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
+"Invalid endianness value. Expected 0x6c (“l”) or 0x42 (“B”) but found value "
"0x%02x"
msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但得到值 0x%02x"
-#: ../gio/gdbusmessage.c:2064
+#: ../gio/gdbusmessage.c:2068
#, c-format
msgid "Invalid major protocol version. Expected 1 but found %d"
msgstr "无效的主协议版本。期望 1，但是找到了 %d"
-#: ../gio/gdbusmessage.c:2120
+#: ../gio/gdbusmessage.c:2124
#, c-format
-msgid "Signature header with signature '%s' found but message body is empty"
+msgid "Signature header with signature “%s” found but message body is empty"
msgstr "发现签名“%s”的签名头部，但邮件正文为空"
-#: ../gio/gdbusmessage.c:2134
+#: ../gio/gdbusmessage.c:2138
#, c-format
-msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
+msgid "Parsed value “%s” is not a valid D-Bus signature (for body)"
msgstr "已解析的值“%s”不是有效的 D-Bus 签名(针对消息主体)"
-#: ../gio/gdbusmessage.c:2164
+#: ../gio/gdbusmessage.c:2168
#, c-format
msgid "No signature header in message but the message body is %u byte"
msgid_plural "No signature header in message but the message body is %u bytes"
msgstr[0] "消息中没有签名的头部，但消息主体为 %u 字节"
-#: ../gio/gdbusmessage.c:2174
+#: ../gio/gdbusmessage.c:2178
msgid "Cannot deserialize message: "
msgstr "无法解串消息："
-#: ../gio/gdbusmessage.c:2515
+#: ../gio/gdbusmessage.c:2519
#, c-format
msgid ""
-"Error serializing GVariant with type string '%s' to the D-Bus wire format"
+"Error serializing GVariant with type string “%s” to the D-Bus wire format"
msgstr "在以 D-Bus 线格式用类型字符串“%s”序列化 GVariant 时发生错误"
-#: ../gio/gdbusmessage.c:2652
+#: ../gio/gdbusmessage.c:2656
#, c-format
msgid ""
"Message has %d file descriptors but the header field indicates %d file "
"descriptors"
msgstr "消息拥有 %d 个文件描述符，但是头区域指出 %d 个文件描述符"
-#: ../gio/gdbusmessage.c:2660
+#: ../gio/gdbusmessage.c:2664
msgid "Cannot serialize message: "
msgstr "无法串行消息："
-#: ../gio/gdbusmessage.c:2704
+#: ../gio/gdbusmessage.c:2708
#, c-format
-msgid "Message body has signature '%s' but there is no signature header"
+msgid "Message body has signature “%s” but there is no signature header"
msgstr "消息主体有签名“%s”但是没有签名头部"
-#: ../gio/gdbusmessage.c:2714
+#: ../gio/gdbusmessage.c:2718
#, c-format
msgid ""
-"Message body has type signature '%s' but signature in the header field is "
-"'%s'"
+"Message body has type signature “%s” but signature in the header field is "
+"“%s”"
msgstr "消息主体有类型签名“%s”但头域的签名为“%s”"
-#: ../gio/gdbusmessage.c:2730
+#: ../gio/gdbusmessage.c:2734
#, c-format
-msgid "Message body is empty but signature in the header field is '(%s)'"
+msgid "Message body is empty but signature in the header field is “(%s)”"
msgstr "消息主体为空，但头域的签名为“(%s)”"
-#: ../gio/gdbusmessage.c:3283
+#: ../gio/gdbusmessage.c:3287
#, c-format
-msgid "Error return with body of type '%s'"
+msgid "Error return with body of type “%s”"
msgstr "返回主体类型“%s”出错"
-#: ../gio/gdbusmessage.c:3291
+#: ../gio/gdbusmessage.c:3295
msgid "Error return with empty body"
msgstr "返回空主体出错"
-#: ../gio/gdbusprivate.c:2038
+#: ../gio/gdbusprivate.c:2066
#, c-format
msgid "Unable to get Hardware profile: %s"
msgstr "无法获得硬件测量信息：%s"
-#: ../gio/gdbusprivate.c:2083
+#: ../gio/gdbusprivate.c:2111
msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
msgstr "无法加载 /var/lib/dbus/machine-id 和 /etc/machine-id："
@@ -896,7 +900,7 @@
msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d"
-#: ../gio/gdbusproxy.c:2713 ../gio/gdbusproxy.c:2847
+#: ../gio/gdbusproxy.c:2719 ../gio/gdbusproxy.c:2853
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"
@@ -912,19 +916,19 @@
msgid "Cannot specify nonce file when creating a server"
msgstr "创建服务器时无法指定临时文件"
-#: ../gio/gdbusserver.c:873
+#: ../gio/gdbusserver.c:876
#, c-format
-msgid "Error writing nonce file at '%s': %s"
+msgid "Error writing nonce file at “%s”: %s"
msgstr "写入“%s”处的临时文件时出错：%s"
-#: ../gio/gdbusserver.c:1044
+#: ../gio/gdbusserver.c:1047
#, c-format
-msgid "The string '%s' is not a valid D-Bus GUID"
+msgid "The string “%s” is not a valid D-Bus GUID"
msgstr "字符串“%s”不是有效 D-Bus GUID"
-#: ../gio/gdbusserver.c:1084
+#: ../gio/gdbusserver.c:1087
#, c-format
-msgid "Cannot listen on unsupported transport '%s'"
+msgid "Cannot listen on unsupported transport “%s”"
msgstr "无法监听不支持的传输“%s”"
#: ../gio/gdbus-tool.c:95
@@ -936,8 +940,9 @@
" monitor Monitor a remote object\n"
" call Invoke a method on a remote object\n"
" emit Emit a signal\n"
+" wait Wait for a bus name to appear\n"
"\n"
-"Use \"%s COMMAND --help\" to get help on each command.\n"
+"Use “%s COMMAND --help” to get help on each command.\n"
msgstr ""
"命令：\n"
" help 显示本信息\n"
@@ -945,281 +950,323 @@
" monitor 监视一个远程对象\n"
" call 调用远程对象的一个方法\n"
" emit 发出一个信号\n"
+" wait 等待总线名称出现\n"
"\n"
"使用“%s COMMAND --help”以获得每一个命令的帮助。\n"
-#: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298
-#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067
-#: ../gio/gdbus-tool.c:1509 ../gio/gio-tool-rename.c:84
+#: ../gio/gdbus-tool.c:167 ../gio/gdbus-tool.c:234 ../gio/gdbus-tool.c:306
+#: ../gio/gdbus-tool.c:330 ../gio/gdbus-tool.c:811 ../gio/gdbus-tool.c:1150
+#: ../gio/gdbus-tool.c:1592
#, c-format
msgid "Error: %s\n"
msgstr "错误：%s\n"
-#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1525
+#: ../gio/gdbus-tool.c:178 ../gio/gdbus-tool.c:247 ../gio/gdbus-tool.c:1608
#, c-format
msgid "Error parsing introspection XML: %s\n"
msgstr "解析 Introspection XML 时出错：%s\n"
-#: ../gio/gdbus-tool.c:208
+#: ../gio/gdbus-tool.c:216
#, c-format
msgid "Error: %s is not a valid name\n"
msgstr "错误：%s 不是有效的名称。\n"
-#: ../gio/gdbus-tool.c:356
+#: ../gio/gdbus-tool.c:364
msgid "Connect to the system bus"
msgstr "连接到系统总线"
-#: ../gio/gdbus-tool.c:357
+#: ../gio/gdbus-tool.c:365
msgid "Connect to the session bus"
msgstr "连接到会话总线"
-#: ../gio/gdbus-tool.c:358
+#: ../gio/gdbus-tool.c:366
msgid "Connect to given D-Bus address"
msgstr "连接到给定的 D-Bus 地址"
-#: ../gio/gdbus-tool.c:368
+#: ../gio/gdbus-tool.c:376
msgid "Connection Endpoint Options:"
msgstr "连接端点选项："
-#: ../gio/gdbus-tool.c:369
+#: ../gio/gdbus-tool.c:377
msgid "Options specifying the connection endpoint"
msgstr "指定连接端点的选项"
-#: ../gio/gdbus-tool.c:391
+#: ../gio/gdbus-tool.c:399
#, c-format
msgid "No connection endpoint specified"
msgstr "没有指定连接的端点"
-#: ../gio/gdbus-tool.c:401
+#: ../gio/gdbus-tool.c:409
#, c-format
msgid "Multiple connection endpoints specified"
msgstr "指定了多个连接端点"
-#: ../gio/gdbus-tool.c:471
+#: ../gio/gdbus-tool.c:479
#, c-format
msgid ""
-"Warning: According to introspection data, interface '%s' does not exist\n"
+"Warning: According to introspection data, interface “%s” does not exist\n"
msgstr "警告：根据 Introspection 数据，接口“%s”不存在\n"
-#: ../gio/gdbus-tool.c:480
+#: ../gio/gdbus-tool.c:488
#, c-format
msgid ""
-"Warning: According to introspection data, method '%s' does not exist on "
-"interface '%s'\n"
+"Warning: According to introspection data, method “%s” does not exist on "
+"interface “%s”\n"
msgstr "警告：根据 Introspection 数据，在接口“%2$s”中方法“%1$s”不存在\n"
-#: ../gio/gdbus-tool.c:542
+#: ../gio/gdbus-tool.c:550
msgid "Optional destination for signal (unique name)"
msgstr "信号的可选目标位置(唯一名称)"
-#: ../gio/gdbus-tool.c:543
+#: ../gio/gdbus-tool.c:551
msgid "Object path to emit signal on"
msgstr "要触发信号的对象路径"
-#: ../gio/gdbus-tool.c:544
+#: ../gio/gdbus-tool.c:552
msgid "Signal and interface name"
msgstr "信号和接口名称"
-#: ../gio/gdbus-tool.c:578
+#: ../gio/gdbus-tool.c:587
msgid "Emit a signal."
msgstr "发射信号。"
-#: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615
-#: ../gio/gdbus-tool.c:1850
+#: ../gio/gdbus-tool.c:642 ../gio/gdbus-tool.c:944 ../gio/gdbus-tool.c:1698
+#: ../gio/gdbus-tool.c:1931 ../gio/gdbus-tool.c:2152
#, c-format
msgid "Error connecting: %s\n"
msgstr "连接时出错：%s\n"
-#: ../gio/gdbus-tool.c:624
-#, c-format
-msgid "Error: object path not specified.\n"
-msgstr "错误：没有指定对象路径。\n"
-
-#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:924 ../gio/gdbus-tool.c:1680
-#: ../gio/gdbus-tool.c:1916
-#, c-format
-msgid "Error: %s is not a valid object path\n"
-msgstr "错误：%s 不是有效的对象路径\n"
-
-#: ../gio/gdbus-tool.c:635
-#, c-format
-msgid "Error: signal not specified.\n"
-msgstr "错误：没有指定对象。\n"
-
-#: ../gio/gdbus-tool.c:642
-#, c-format
-msgid "Error: signal must be the fully-qualified name.\n"
-msgstr "错误：信号必须是完全限定名。\n"
-
-#: ../gio/gdbus-tool.c:650
-#, c-format
-msgid "Error: %s is not a valid interface name\n"
-msgstr "错误：%s 不是有效的接口名称。\n"
-
-#: ../gio/gdbus-tool.c:656
-#, c-format
-msgid "Error: %s is not a valid member name\n"
-msgstr "错误：%s 不是有效的成员名称。\n"
-
-#: ../gio/gdbus-tool.c:662
-#, c-format
-msgid "Error: %s is not a valid unique bus name.\n"
-msgstr "错误：%s 不是有效的唯一总线名。\n"
-
-#. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:699 ../gio/gdbus-tool.c:1036
-#, c-format
-msgid "Error parsing parameter %d: %s\n"
-msgstr "解析第 %d 个选项出错：%s\n"
-
-#: ../gio/gdbus-tool.c:731
-#, c-format
-msgid "Error flushing connection: %s\n"
-msgstr "清空连接接时出错：%s\n"
-
-#: ../gio/gdbus-tool.c:758
-msgid "Destination name to invoke method on"
-msgstr "调用方法的目标位置名称"
-
-#: ../gio/gdbus-tool.c:759
-msgid "Object path to invoke method on"
-msgstr "调用方法的对象路径"
-
-#: ../gio/gdbus-tool.c:760
-msgid "Method and interface name"
-msgstr "方法和接口名称"
-
-#: ../gio/gdbus-tool.c:761
-msgid "Timeout in seconds"
-msgstr "超时(以秒为单位)"
-
-#: ../gio/gdbus-tool.c:802
-msgid "Invoke a method on a remote object."
-msgstr "在远程对象上调用一个方法。"
-
-#: ../gio/gdbus-tool.c:877 ../gio/gdbus-tool.c:1634 ../gio/gdbus-tool.c:1869
+#: ../gio/gdbus-tool.c:659 ../gio/gdbus-tool.c:961 ../gio/gdbus-tool.c:1715
+#: ../gio/gdbus-tool.c:1956
#, c-format
msgid "Error: Destination is not specified\n"
msgstr "错误：没有指定目标位置名称\n"
-#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1651 ../gio/gdbus-tool.c:1881
+#: ../gio/gdbus-tool.c:670
#, c-format
-msgid "Error: %s is not a valid bus name\n"
-msgstr "错误：%s 不是有效的总线名称。\n"
+msgid "Error: %s is not a valid unique bus name.\n"
+msgstr "错误：%s 不是有效的唯一总线名。\n"
-#: ../gio/gdbus-tool.c:904 ../gio/gdbus-tool.c:1660
+#: ../gio/gdbus-tool.c:685 ../gio/gdbus-tool.c:987 ../gio/gdbus-tool.c:1741
#, c-format
msgid "Error: Object path is not specified\n"
msgstr "错误：没有指定对象路径\n"
-#: ../gio/gdbus-tool.c:939
+#: ../gio/gdbus-tool.c:705 ../gio/gdbus-tool.c:1007 ../gio/gdbus-tool.c:1761
+#: ../gio/gdbus-tool.c:2002
+#, c-format
+msgid "Error: %s is not a valid object path\n"
+msgstr "错误：%s 不是有效的对象路径\n"
+
+#: ../gio/gdbus-tool.c:720
+#, fuzzy, c-format
+#| msgid "Error: Method name is not specified\n"
+msgid "Error: Signal name is not specified\n"
+msgstr "错误：方法名没有指定\n"
+
+#: ../gio/gdbus-tool.c:731
+#, fuzzy, c-format
+#| msgid "Error: Method name “%s” is invalid\n"
+msgid "Error: Signal name “%s” is invalid\n"
+msgstr "错误：方法名“%s”无效\n"
+
+#: ../gio/gdbus-tool.c:743
+#, c-format
+msgid "Error: %s is not a valid interface name\n"
+msgstr "错误：%s 不是有效的接口名称。\n"
+
+#: ../gio/gdbus-tool.c:749
+#, c-format
+msgid "Error: %s is not a valid member name\n"
+msgstr "错误：%s 不是有效的成员名称。\n"
+
+#. Use the original non-"parse-me-harder" error
+#: ../gio/gdbus-tool.c:786 ../gio/gdbus-tool.c:1119
+#, c-format
+msgid "Error parsing parameter %d: %s\n"
+msgstr "解析第 %d 个选项出错：%s\n"
+
+#: ../gio/gdbus-tool.c:818
+#, c-format
+msgid "Error flushing connection: %s\n"
+msgstr "清空连接接时出错：%s\n"
+
+#: ../gio/gdbus-tool.c:845
+msgid "Destination name to invoke method on"
+msgstr "调用方法的目标位置名称"
+
+#: ../gio/gdbus-tool.c:846
+msgid "Object path to invoke method on"
+msgstr "调用方法的对象路径"
+
+#: ../gio/gdbus-tool.c:847
+msgid "Method and interface name"
+msgstr "方法和接口名称"
+
+#: ../gio/gdbus-tool.c:848
+msgid "Timeout in seconds"
+msgstr "超时(以秒为单位)"
+
+#: ../gio/gdbus-tool.c:889
+msgid "Invoke a method on a remote object."
+msgstr "在远程对象上调用一个方法。"
+
+#: ../gio/gdbus-tool.c:972 ../gio/gdbus-tool.c:1732 ../gio/gdbus-tool.c:1967
+#, c-format
+msgid "Error: %s is not a valid bus name\n"
+msgstr "错误：%s 不是有效的总线名称。\n"
+
+#: ../gio/gdbus-tool.c:1022
#, c-format
msgid "Error: Method name is not specified\n"
msgstr "错误：方法名没有指定\n"
-#: ../gio/gdbus-tool.c:950
+#: ../gio/gdbus-tool.c:1033
#, c-format
-msgid "Error: Method name '%s' is invalid\n"
+msgid "Error: Method name “%s” is invalid\n"
msgstr "错误：方法名“%s”无效\n"
-#: ../gio/gdbus-tool.c:1028
+#: ../gio/gdbus-tool.c:1111
#, c-format
-msgid "Error parsing parameter %d of type '%s': %s\n"
+msgid "Error parsing parameter %d of type “%s”: %s\n"
msgstr "解析\"%2$s\"类型的参数 %1$d 时发生错误：%3$s\n"
-#: ../gio/gdbus-tool.c:1472
+#: ../gio/gdbus-tool.c:1555
msgid "Destination name to introspect"
msgstr "要 Introspect 的目标位置名称"
-#: ../gio/gdbus-tool.c:1473
+#: ../gio/gdbus-tool.c:1556
msgid "Object path to introspect"
msgstr "要 Introspect 的对象路径"
-#: ../gio/gdbus-tool.c:1474
+#: ../gio/gdbus-tool.c:1557
msgid "Print XML"
msgstr "输出 XML"
-#: ../gio/gdbus-tool.c:1475
+#: ../gio/gdbus-tool.c:1558
msgid "Introspect children"
msgstr "Introspect 子对象"
-#: ../gio/gdbus-tool.c:1476
+#: ../gio/gdbus-tool.c:1559
msgid "Only print properties"
msgstr "只打印属性"
-#: ../gio/gdbus-tool.c:1567
+#: ../gio/gdbus-tool.c:1650
msgid "Introspect a remote object."
msgstr "Introspect 远程对象。"
-#: ../gio/gdbus-tool.c:1772
+#: ../gio/gdbus-tool.c:1853
msgid "Destination name to monitor"
msgstr "要监视的目标位置名称"
-#: ../gio/gdbus-tool.c:1773
+#: ../gio/gdbus-tool.c:1854
msgid "Object path to monitor"
msgstr "要监视的对象路径"
-#: ../gio/gdbus-tool.c:1802
+#: ../gio/gdbus-tool.c:1883
msgid "Monitor a remote object."
msgstr "监视一个远程对象。"
-#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
+#: ../gio/gdbus-tool.c:1941
+#, c-format
+msgid "Error: can’t monitor a non-message-bus connection\n"
+msgstr ""
+
+#: ../gio/gdbus-tool.c:2065
+msgid "Service to activate before waiting for the other one (well-known name)"
+msgstr "在等待另一服务前要激活的服务（常见名称）"
+
+#: ../gio/gdbus-tool.c:2068
+msgid ""
+"Timeout to wait for before exiting with an error (seconds); 0 for no timeout "
+"(default)"
+msgstr "出现错误退出前的超时（秒）; 0为无超时（默认）"
+
+#: ../gio/gdbus-tool.c:2116
+msgid "[OPTION…] BUS-NAME"
+msgstr "[选项…] 总线名称"
+
+#: ../gio/gdbus-tool.c:2118
+msgid "Wait for a bus name to appear."
+msgstr "等待总线名称出现。"
+
+#: ../gio/gdbus-tool.c:2194
+#, c-format
+msgid "Error: A service to activate for must be specified.\n"
+msgstr "错误：没有指定需要激活的服务名称。\n"
+
+#: ../gio/gdbus-tool.c:2199
+#, c-format
+msgid "Error: A service to wait for must be specified.\n"
+msgstr "错误：没有指定需要等待的服务名称。\n"
+
+#: ../gio/gdbus-tool.c:2204
+#, c-format
+msgid "Error: Too many arguments.\n"
+msgstr "错误：参数过多。\n"
+
+#: ../gio/gdbus-tool.c:2212 ../gio/gdbus-tool.c:2219
+#, c-format
+msgid "Error: %s is not a valid well-known bus name.\n"
+msgstr "错误：%s 不是有效的总线名称。\n"
+
+#: ../gio/gdesktopappinfo.c:2001 ../gio/gdesktopappinfo.c:4531
msgid "Unnamed"
msgstr "未命名"
-#: ../gio/gdesktopappinfo.c:2404
-msgid "Desktop file didn't specify Exec field"
+#: ../gio/gdesktopappinfo.c:2411
+msgid "Desktop file didn’t specify Exec field"
msgstr "桌面文件未指定 Exec 区域"
-#: ../gio/gdesktopappinfo.c:2689
+#: ../gio/gdesktopappinfo.c:2694
msgid "Unable to find terminal required for application"
msgstr "无法找到应用程序需要的终端"
-#: ../gio/gdesktopappinfo.c:3097
+#: ../gio/gdesktopappinfo.c:3127
#, c-format
-msgid "Can't create user application configuration folder %s: %s"
+msgid "Can’t create user application configuration folder %s: %s"
msgstr "无法创建用户应用程序配置文件夹 %s：%s"
-#: ../gio/gdesktopappinfo.c:3101
+#: ../gio/gdesktopappinfo.c:3131
#, c-format
-msgid "Can't create user MIME configuration folder %s: %s"
+msgid "Can’t create user MIME configuration folder %s: %s"
msgstr "无法创建用户 MIME 配置文件夹 %s：%s"
-#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
+#: ../gio/gdesktopappinfo.c:3371 ../gio/gdesktopappinfo.c:3395
msgid "Application information lacks an identifier"
msgstr "应用程序信息缺少标志符。"
-#: ../gio/gdesktopappinfo.c:3599
+#: ../gio/gdesktopappinfo.c:3629
#, c-format
-msgid "Can't create user desktop file %s"
+msgid "Can’t create user desktop file %s"
msgstr "无法创建用户桌面文件 %s"
-#: ../gio/gdesktopappinfo.c:3733
+#: ../gio/gdesktopappinfo.c:3763
#, c-format
msgid "Custom definition for %s"
msgstr "%s 的自定义定义"
#: ../gio/gdrive.c:417
-msgid "drive doesn't implement eject"
+msgid "drive doesn’t implement eject"
msgstr "驱动器未实现弹出"
#. Translators: This is an error
#. * message for drive objects that
#. * don't implement any of eject or eject_with_operation.
#: ../gio/gdrive.c:495
-msgid "drive doesn't implement eject or eject_with_operation"
+msgid "drive doesn’t implement eject or eject_with_operation"
msgstr "驱动器未实现弹出或 eject_with_operation"
#: ../gio/gdrive.c:571
-msgid "drive doesn't implement polling for media"
+msgid "drive doesn’t implement polling for media"
msgstr "驱动器未实现媒体轮询"
#: ../gio/gdrive.c:776
-msgid "drive doesn't implement start"
+msgid "drive doesn’t implement start"
msgstr "驱动器未实现启动"
#: ../gio/gdrive.c:878
-msgid "drive doesn't implement stop"
+msgid "drive doesn’t implement stop"
msgstr "驱动器未实现停止"
#: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
@@ -1233,8 +1280,8 @@
#: ../gio/gemblem.c:323
#, c-format
-msgid "Can't handle version %d of GEmblem encoding"
-msgstr "无法处理 GEmblem 编码的版本 %d "
+msgid "Can’t handle version %d of GEmblem encoding"
+msgstr "无法处理版本为 %d 的 GEmblem 编码"
#: ../gio/gemblem.c:333
#, c-format
@@ -1243,8 +1290,8 @@
#: ../gio/gemblemedicon.c:362
#, c-format
-msgid "Can't handle version %d of GEmblemedIcon encoding"
-msgstr "无法处理 GEmblemedIcon 编码的版本 %d"
+msgid "Can’t handle version %d of GEmblemedIcon encoding"
+msgstr "无法处理版本为 %d 的 GEmblemedIcon 编码"
#: ../gio/gemblemedicon.c:372
#, c-format
@@ -1258,10 +1305,10 @@
#: ../gio/gfile.c:969 ../gio/gfile.c:1207 ../gio/gfile.c:1345
#: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
#: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
-#: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659
-#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405
-#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991
-#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276
+#: ../gio/gfile.c:1956 ../gio/gfile.c:3602 ../gio/gfile.c:3657
+#: ../gio/gfile.c:3893 ../gio/gfile.c:3935 ../gio/gfile.c:4403
+#: ../gio/gfile.c:4814 ../gio/gfile.c:4899 ../gio/gfile.c:4989
+#: ../gio/gfile.c:5086 ../gio/gfile.c:5173 ../gio/gfile.c:5274
#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991
#: ../gio/win32/gwinhttpfile.c:437
msgid "Operation not supported"
@@ -1275,12 +1322,12 @@
msgid "Containing mount does not exist"
msgstr "包含的挂载不存在"
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374
-msgid "Can't copy over directory"
+#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2377
+msgid "Can’t copy over directory"
msgstr "无法跨目录复制"
#: ../gio/gfile.c:2575
-msgid "Can't copy directory over directory"
+msgid "Can’t copy directory over directory"
msgstr "无法跨目录复制到目录"
#: ../gio/gfile.c:2583
@@ -1288,52 +1335,52 @@
msgstr "目标文件已存在"
#: ../gio/gfile.c:2602
-msgid "Can't recursively copy directory"
+msgid "Can’t recursively copy directory"
msgstr "无法递归复制目录"
-#: ../gio/gfile.c:2884
+#: ../gio/gfile.c:2877
msgid "Splice not supported"
msgstr "不支持拼接"
-#: ../gio/gfile.c:2888
+#: ../gio/gfile.c:2881
#, c-format
msgid "Error splicing file: %s"
msgstr "拼接文件时出错：%s"
-#: ../gio/gfile.c:3019
+#: ../gio/gfile.c:3013
msgid "Copy (reflink/clone) between mounts is not supported"
msgstr "不支持在挂载之间复制(reflink/clone)"
-#: ../gio/gfile.c:3023
+#: ../gio/gfile.c:3017
msgid "Copy (reflink/clone) is not supported or invalid"
msgstr "不支持复制(reflink/clone)操作或操作非法"
-#: ../gio/gfile.c:3028
-msgid "Copy (reflink/clone) is not supported or didn't work"
+#: ../gio/gfile.c:3022
+msgid "Copy (reflink/clone) is not supported or didn’t work"
msgstr "不支持复制(reflink/clone)操作或者不工作"
-#: ../gio/gfile.c:3091
-msgid "Can't copy special file"
+#: ../gio/gfile.c:3085
+msgid "Can’t copy special file"
msgstr "无法复制特殊文件"
-#: ../gio/gfile.c:3885
+#: ../gio/gfile.c:3883
msgid "Invalid symlink value given"
msgstr "给出的符号链接值无效"
-#: ../gio/gfile.c:4046
+#: ../gio/gfile.c:4044
msgid "Trash not supported"
msgstr "不支持回收站"
-#: ../gio/gfile.c:4158
+#: ../gio/gfile.c:4156
#, c-format
-msgid "File names cannot contain '%c'"
+msgid "File names cannot contain “%c”"
msgstr "文件名不能包含“%c”"
-#: ../gio/gfile.c:6604 ../gio/gvolume.c:363
-msgid "volume doesn't implement mount"
+#: ../gio/gfile.c:6602 ../gio/gvolume.c:363
+msgid "volume doesn’t implement mount"
msgstr "卷未实现挂载"
-#: ../gio/gfile.c:6713
+#: ../gio/gfile.c:6711
msgid "No application is registered as handling this file"
msgstr "没有为此类型文件注册相应的处理程序"
@@ -1352,8 +1399,8 @@
#: ../gio/gfileicon.c:236
#, c-format
-msgid "Can't handle version %d of GFileIcon encoding"
-msgstr "无法处理 GFileIcon 编码的版本 %d"
+msgid "Can’t handle version %d of GFileIcon encoding"
+msgstr "无法处理版本为 %d 的 GFileIcon 编码"
#: ../gio/gfileicon.c:246
msgid "Malformed input data for GFileIcon"
@@ -1362,7 +1409,7 @@
#: ../gio/gfileinputstream.c:149 ../gio/gfileinputstream.c:394
#: ../gio/gfileiostream.c:167 ../gio/gfileoutputstream.c:164
#: ../gio/gfileoutputstream.c:497
-msgid "Stream doesn't support query_info"
+msgid "Stream doesn’t support query_info"
msgstr "流不支持 query_info"
#: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
@@ -1378,28 +1425,33 @@
msgid "Truncate not supported on stream"
msgstr "流不支持截断"
-#: ../gio/ghttpproxy.c:136
+#: ../gio/ghttpproxy.c:91 ../gio/gresolver.c:410 ../gio/gresolver.c:476
+#: ../glib/gconvert.c:1650
+msgid "Invalid hostname"
+msgstr "无效的主机名"
+
+#: ../gio/ghttpproxy.c:143
msgid "Bad HTTP proxy reply"
msgstr "非法的 HTTP 代理服务器回复"
-#: ../gio/ghttpproxy.c:152
+#: ../gio/ghttpproxy.c:159
msgid "HTTP proxy connection not allowed"
msgstr "不允许 HTTP 代理连接"
-#: ../gio/ghttpproxy.c:157
+#: ../gio/ghttpproxy.c:164
msgid "HTTP proxy authentication failed"
msgstr "HTTP 代理服务器认证失败"
-#: ../gio/ghttpproxy.c:160
+#: ../gio/ghttpproxy.c:167
msgid "HTTP proxy authentication required"
msgstr "HTTP 代理服务器需要认证"
-#: ../gio/ghttpproxy.c:164
+#: ../gio/ghttpproxy.c:171
#, c-format
msgid "HTTP proxy connection failed: %i"
msgstr "连接到 HTTP 代理失败: %i"
-#: ../gio/ghttpproxy.c:260
+#: ../gio/ghttpproxy.c:269
msgid "HTTP proxy server closed connection unexpectedly."
msgstr "HTTP 代理服务器意外关闭连接。"
@@ -1434,8 +1486,8 @@
msgstr "类型 %s 没有实现 GIcon 接口的 from_tokens() 方法"
#: ../gio/gicon.c:461
-msgid "Can't handle the supplied version of the icon encoding"
-msgstr "无法处理提供的图标编码版本"
+msgid "Can’t handle the supplied version of the icon encoding"
+msgstr "无法处理提供版本的图标编码"
#: ../gio/ginetaddressmask.c:182
msgid "No address specified"
@@ -1452,11 +1504,11 @@
#: ../gio/ginetaddressmask.c:300
#, c-format
-msgid "Could not parse '%s' as IP address mask"
+msgid "Could not parse “%s” as IP address mask"
msgstr "不能将“%s”解析为 IP 地址掩码"
#: ../gio/ginetsocketaddress.c:203 ../gio/ginetsocketaddress.c:220
-#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:216
+#: ../gio/gnativesocketaddress.c:106 ../gio/gunixsocketaddress.c:218
msgid "Not enough space for socket address"
msgstr "没有足够的空间套接字地址"
@@ -1465,7 +1517,7 @@
msgstr "不支持的套接字地址"
#: ../gio/ginputstream.c:188
-msgid "Input stream doesn't implement read"
+msgid "Input stream doesn’t implement read"
msgstr "输入流未实现读取"
#. Translators: This is an error you get if there is already an
@@ -1479,116 +1531,124 @@
msgid "Stream has outstanding operation"
msgstr "流有异常操作"
-#: ../gio/gio-tool.c:142
+#: ../gio/gio-tool.c:160
msgid "Copy with file"
msgstr "复制文件时保留"
-#: ../gio/gio-tool.c:146
+#: ../gio/gio-tool.c:164
msgid "Keep with file when moved"
msgstr "移动时与文件一起"
-#: ../gio/gio-tool.c:187
-msgid "'version' takes no arguments"
+#: ../gio/gio-tool.c:205
+msgid "“version” takes no arguments"
msgstr "“version”不接受参数"
-#: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857
+#: ../gio/gio-tool.c:207 ../gio/gio-tool.c:223 ../glib/goption.c:857
msgid "Usage:"
msgstr "用法："
-#: ../gio/gio-tool.c:192
+#: ../gio/gio-tool.c:210
msgid "Print version information and exit."
msgstr "打印版本信息并退出。"
-#: ../gio/gio-tool.c:208
+#: ../gio/gio-tool.c:224
+msgid "[ARGS...]"
+msgstr "[ARGS...]"
+
+#: ../gio/gio-tool.c:226
msgid "Commands:"
msgstr "命令："
-#: ../gio/gio-tool.c:211
+#: ../gio/gio-tool.c:229
msgid "Concatenate files to standard output"
msgstr "串接文件，写到标准输出"
-#: ../gio/gio-tool.c:212
+#: ../gio/gio-tool.c:230
msgid "Copy one or more files"
msgstr "复制文件"
-#: ../gio/gio-tool.c:213
+#: ../gio/gio-tool.c:231
msgid "Show information about locations"
msgstr "显示关于位置的信息"
-#: ../gio/gio-tool.c:214
+#: ../gio/gio-tool.c:232
msgid "List the contents of locations"
msgstr "列出某位置的内容"
-#: ../gio/gio-tool.c:215
+#: ../gio/gio-tool.c:233
msgid "Get or set the handler for a mimetype"
msgstr "获取或设置某种 MIME 类型的处理程序"
-#: ../gio/gio-tool.c:216
+#: ../gio/gio-tool.c:234
msgid "Create directories"
msgstr "创建目录"
-#: ../gio/gio-tool.c:217
+#: ../gio/gio-tool.c:235
msgid "Monitor files and directories for changes"
msgstr "监视文件和目录更改"
-#: ../gio/gio-tool.c:218
+#: ../gio/gio-tool.c:236
msgid "Mount or unmount the locations"
msgstr "挂载或卸载位置"
-#: ../gio/gio-tool.c:219
+#: ../gio/gio-tool.c:237
msgid "Move one or more files"
msgstr "移动文件"
-#: ../gio/gio-tool.c:220
+#: ../gio/gio-tool.c:238
msgid "Open files with the default application"
msgstr "用默认应用打开文件"
-#: ../gio/gio-tool.c:221
+#: ../gio/gio-tool.c:239
msgid "Rename a file"
msgstr "重命名文件"
-#: ../gio/gio-tool.c:222
+#: ../gio/gio-tool.c:240
msgid "Delete one or more files"
msgstr "删除文件"
-#: ../gio/gio-tool.c:223
+#: ../gio/gio-tool.c:241
msgid "Read from standard input and save"
msgstr "从标准输入读取并保存"
-#: ../gio/gio-tool.c:224
+#: ../gio/gio-tool.c:242
msgid "Set a file attribute"
msgstr "设置文件属性"
-#: ../gio/gio-tool.c:225
+#: ../gio/gio-tool.c:243
msgid "Move files or directories to the trash"
msgstr "移动文件或目录到回收站"
-#: ../gio/gio-tool.c:226
+#: ../gio/gio-tool.c:244
msgid "Lists the contents of locations in a tree"
msgstr "在树中列出某位置的内容"
-#: ../gio/gio-tool.c:228
+#: ../gio/gio-tool.c:246
#, c-format
msgid "Use %s to get detailed help.\n"
msgstr "使用 %s 以获取详细帮助\n"
+#: ../gio/gio-tool-cat.c:87
+msgid "Error writing to stdout"
+msgstr "写入标准输出出错"
+
#. Translators: commandline placeholder
-#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:278
+#: ../gio/gio-tool-cat.c:133 ../gio/gio-tool-info.c:282
#: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
#: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
#: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
-#: ../gio/gio-tool-monitor.c:202 ../gio/gio-tool-mount.c:1132
-#: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48
+#: ../gio/gio-tool-monitor.c:203 ../gio/gio-tool-mount.c:1141
+#: ../gio/gio-tool-open.c:113 ../gio/gio-tool-remove.c:48
#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
msgid "LOCATION"
msgstr "位置"
-#: ../gio/gio-tool-cat.c:129
+#: ../gio/gio-tool-cat.c:138
msgid "Concatenate files and print to standard output."
msgstr "串接文件，写到标准输出。"
-#: ../gio/gio-tool-cat.c:131
+#: ../gio/gio-tool-cat.c:140
msgid ""
"gio cat works just like the traditional cat utility, but using GIO\n"
"locations instead of local files: for example, you can use something\n"
@@ -1597,9 +1657,11 @@
"glib cat 如传统 cat 程序那样工作，但使用 GIO 位置而非本地文件：\n"
"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
-#: ../gio/gio-tool-cat.c:151
-msgid "No files given"
-msgstr "未给出文件"
+#: ../gio/gio-tool-cat.c:162 ../gio/gio-tool-info.c:313
+#: ../gio/gio-tool-mkdir.c:76 ../gio/gio-tool-monitor.c:228
+#: ../gio/gio-tool-open.c:139 ../gio/gio-tool-remove.c:72
+msgid "No locations given"
+msgstr "未给出位置"
#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
msgid "No target directory"
@@ -1638,7 +1700,7 @@
#. Translators: commandline placeholder
#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
-#: ../gio/gio-tool-save.c:165
+#: ../gio/gio-tool-save.c:160
msgid "DESTINATION"
msgstr "目标"
@@ -1655,14 +1717,14 @@
"glib copy 如传统 cp 程序那样工作，但使用 GIO 位置而非本地文件：\n"
"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
-#: ../gio/gio-tool-copy.c:143
+#: ../gio/gio-tool-copy.c:147
#, c-format
msgid "Destination %s is not a directory"
msgstr "目标“%s”不是目录"
-#: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
+#: ../gio/gio-tool-copy.c:192 ../gio/gio-tool-move.c:185
#, c-format
-msgid "%s: overwrite '%s'? "
+msgid "%s: overwrite “%s”? "
msgstr "%s：要覆盖“%s”吗？"
#: ../gio/gio-tool-info.c:34
@@ -1682,7 +1744,7 @@
msgstr "属性"
#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
-msgid "Don't follow symbolic links"
+msgid "Don’t follow symbolic links"
msgstr "不要跟随符号链接"
#: ../gio/gio-tool-info.c:75
@@ -1727,42 +1789,33 @@
msgid "uri: %s\n"
msgstr "uri：%s\n"
-#: ../gio/gio-tool-info.c:221
-#, c-format
-msgid "Error getting writable attributes: %s\n"
-msgstr "获取可写属性出错：%s\n"
-
-#: ../gio/gio-tool-info.c:226
+#: ../gio/gio-tool-info.c:228
#, c-format
msgid "Settable attributes:\n"
msgstr "可设置的属性：\n"
-#: ../gio/gio-tool-info.c:249
+#: ../gio/gio-tool-info.c:252
#, c-format
msgid "Writable attribute namespaces:\n"
msgstr "可写的属性命名空间：\n"
-#: ../gio/gio-tool-info.c:283
+#: ../gio/gio-tool-info.c:287
msgid "Show information about locations."
msgstr "显示位置信息。"
-#: ../gio/gio-tool-info.c:285
+#: ../gio/gio-tool-info.c:289
msgid ""
"gio info is similar to the traditional ls utility, but using GIO\n"
"locations instead of local files: for example, you can use something\n"
"like smb://server/resource/file.txt as location. File attributes can\n"
"be specified with their GIO name, e.g. standard::icon, or just by\n"
-"namespace, e.g. unix, or by '*', which matches all attributes"
+"namespace, e.g. unix, or by “*”, which matches all attributes"
msgstr ""
"glib info 如传统 ls 程序那样工作，但使用 GIO 位置而非本地文件：\n"
"例如，你可以指定 smb://server/resource/file.txt 之类的位置。要指定\n"
"文件属性，可使用其 GIO 名字(如 standard::icon)，也可以使用命名\n"
"空间(如 unix)，也可使用“*”匹配全部。"
-#: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74
-msgid "No locations given"
-msgstr "未给出位置"
-
#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
msgid "Show hidden files"
msgstr "显示隐藏文件"
@@ -1813,48 +1866,48 @@
"应用程序。如果已给定处理程序，它将被设为 MIME 类型的\n"
"默认应用程序。"
-#: ../gio/gio-tool-mime.c:98
+#: ../gio/gio-tool-mime.c:100
msgid "Must specify a single mimetype, and maybe a handler"
msgstr "必须指定一个 MIME 类型，也可同时指定处理程序"
-#: ../gio/gio-tool-mime.c:113
+#: ../gio/gio-tool-mime.c:116
#, c-format
-msgid "No default applications for '%s'\n"
+msgid "No default applications for “%s”\n"
msgstr "“%s”未设置默认应用程序\n"
-#: ../gio/gio-tool-mime.c:119
+#: ../gio/gio-tool-mime.c:122
#, c-format
-msgid "Default application for '%s': %s\n"
+msgid "Default application for “%s”: %s\n"
msgstr "用于“%s”的默认应用程序：%s\n"
-#: ../gio/gio-tool-mime.c:124
+#: ../gio/gio-tool-mime.c:127
#, c-format
msgid "Registered applications:\n"
msgstr "已注册的应用程序：\n"
-#: ../gio/gio-tool-mime.c:126
+#: ../gio/gio-tool-mime.c:129
#, c-format
msgid "No registered applications\n"
msgstr "无已注册的应用程序\n"
-#: ../gio/gio-tool-mime.c:137
+#: ../gio/gio-tool-mime.c:140
#, c-format
msgid "Recommended applications:\n"
msgstr "推荐的应用程序：\n"
-#: ../gio/gio-tool-mime.c:139
+#: ../gio/gio-tool-mime.c:142
#, c-format
msgid "No recommended applications\n"
msgstr "无推荐的应用程序\n"
-#: ../gio/gio-tool-mime.c:159
+#: ../gio/gio-tool-mime.c:162
#, c-format
-msgid "Failed to load info for handler '%s'\n"
-msgstr "读取处理程序“%s”的信息失败\n"
+msgid "Failed to load info for handler “%s”"
+msgstr "读取处理程序“%s”的信息失败"
-#: ../gio/gio-tool-mime.c:165
+#: ../gio/gio-tool-mime.c:168
#, c-format
-msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgid "Failed to set “%s” as the default handler for “%s”: %s\n"
msgstr "将“%s”设置为“%s”的默认处理程序失败：%s\n"
#: ../gio/gio-tool-mkdir.c:31
@@ -1887,7 +1940,7 @@
msgstr "直接监视文件(通过硬链接通知更改)"
#: ../gio/gio-tool-monitor.c:43
-msgid "Monitors a file directly, but doesn't report changes"
+msgid "Monitors a file directly, but doesn’t report changes"
msgstr "直接监视文件，但不报告更改"
#: ../gio/gio-tool-monitor.c:45
@@ -1898,7 +1951,7 @@
msgid "Watch for mount events"
msgstr "检测挂载事件"
-#: ../gio/gio-tool-monitor.c:207
+#: ../gio/gio-tool-monitor.c:208
msgid "Monitor files or directories for changes."
msgstr "监视文件和目录更改。"
@@ -1952,51 +2005,24 @@
msgstr "显示附加选项"
#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
-#, c-format
-msgid "Error mounting location: Anonymous access denied\n"
-msgstr "挂载位置出错：匿名访问被拒绝\n"
+msgid "Anonymous access denied"
+msgstr "匿名访问被拒绝"
-#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:278
-#, c-format
-msgid "Error mounting location: %s\n"
-msgstr "挂载位置出错：%s\n"
-
-#: ../gio/gio-tool-mount.c:341
-#, c-format
-msgid "Error unmounting mount: %s\n"
-msgstr "卸载挂载点出错：%s\n"
-
-#: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419
-#, c-format
-msgid "Error finding enclosing mount: %s\n"
-msgstr "寻找闭合挂载出错：%s\n"
-
-#: ../gio/gio-tool-mount.c:394
-#, c-format
-msgid "Error ejecting mount: %s\n"
-msgstr "弹出挂载出错：%s\n"
-
-#: ../gio/gio-tool-mount.c:875
-#, c-format
-msgid "Error mounting %s: %s\n"
-msgstr "挂载 %s 出错：%s\n"
-
-#: ../gio/gio-tool-mount.c:891
+#: ../gio/gio-tool-mount.c:897
#, c-format
msgid "Mounted %s at %s\n"
msgstr "已将 %s 挂载为 %s\n"
-#: ../gio/gio-tool-mount.c:941
-#, c-format
-msgid "No volume for device file %s\n"
-msgstr "设备文件 %s 中无卷\n"
+#: ../gio/gio-tool-mount.c:950
+msgid "No volume for device file"
+msgstr "没有卷对应的设备文件"
-#: ../gio/gio-tool-mount.c:1136
+#: ../gio/gio-tool-mount.c:1145
msgid "Mount or unmount the locations."
msgstr "挂载或卸载位置。"
#: ../gio/gio-tool-move.c:42
-msgid "Don't use copy and delete fallback"
+msgid "Don’t use copy and delete fallback"
msgstr "不要使用复制和删除替代方案"
#: ../gio/gio-tool-move.c:99
@@ -2012,21 +2038,17 @@
"glib mv 如传统 mv 程序那样工作，但使用 GIO 位置而非本地文件：\n"
"例如，你可以指定 smb://server/resource/file.txt 之类的位置。"
-#: ../gio/gio-tool-move.c:139
+#: ../gio/gio-tool-move.c:142
#, c-format
msgid "Target %s is not a directory"
msgstr "目标 %s 不是目录"
-#: ../gio/gio-tool-open.c:50
+#: ../gio/gio-tool-open.c:118
msgid ""
"Open files with the default application that\n"
"is registered to handle files of this type."
msgstr "使用处理此类文件的默认应用程序打开文件。"
-#: ../gio/gio-tool-open.c:69
-msgid "No files to open"
-msgstr "没有要打开的文件"
-
#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
msgid "Ignore nonexistent files, never prompt"
msgstr "忽略不存在的文件，从不提示"
@@ -2035,10 +2057,6 @@
msgid "Delete the given files."
msgstr "删除指定文件。"
-#: ../gio/gio-tool-remove.c:70
-msgid "No files to delete"
-msgstr "没有要删除的文件"
-
#: ../gio/gio-tool-rename.c:45
msgid "NAME"
msgstr "名称"
@@ -2047,16 +2065,16 @@
msgid "Rename a file."
msgstr "重命名文件。"
-#: ../gio/gio-tool-rename.c:68
+#: ../gio/gio-tool-rename.c:70
msgid "Missing argument"
msgstr "缺少参数"
-#: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192
-#: ../gio/gio-tool-set.c:134
+#: ../gio/gio-tool-rename.c:76 ../gio/gio-tool-save.c:190
+#: ../gio/gio-tool-set.c:137
msgid "Too many arguments"
msgstr "参数过多"
-#: ../gio/gio-tool-rename.c:91
+#: ../gio/gio-tool-rename.c:95
#, c-format
msgid "Rename successful. New uri: %s\n"
msgstr "重命名成功。新 uri：%s\n"
@@ -2091,17 +2109,21 @@
msgid "ETAG"
msgstr "ETAG"
+#: ../gio/gio-tool-save.c:113
+msgid "Error reading from standard input"
+msgstr "读取标准输入出错：%s"
+
#. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../gio/gio-tool-save.c:145
+#: ../gio/gio-tool-save.c:139
#, c-format
msgid "Etag not available\n"
msgstr "ETAG 不可用\n"
-#: ../gio/gio-tool-save.c:168
+#: ../gio/gio-tool-save.c:163
msgid "Read from standard input and save to DEST."
msgstr "读取标准输入并保存到目标。"
-#: ../gio/gio-tool-save.c:186
+#: ../gio/gio-tool-save.c:183
msgid "No destination given"
msgstr "未给出目标"
@@ -2125,27 +2147,22 @@
msgid "Set a file attribute of LOCATION."
msgstr "设置位置的文件属性。"
-#: ../gio/gio-tool-set.c:111
+#: ../gio/gio-tool-set.c:113
msgid "Location not specified"
msgstr "未指定位置"
-#: ../gio/gio-tool-set.c:119
+#: ../gio/gio-tool-set.c:120
msgid "Attribute not specified"
msgstr "未指定属性"
-#: ../gio/gio-tool-set.c:128
+#: ../gio/gio-tool-set.c:130
msgid "Value not specified"
msgstr "未指定值"
-#: ../gio/gio-tool-set.c:176
+#: ../gio/gio-tool-set.c:180
#, c-format
-msgid "Invalid attribute type %s\n"
-msgstr "无效的属性类型 %s\n"
-
-#: ../gio/gio-tool-set.c:189
-#, c-format
-msgid "Error setting attribute: %s\n"
-msgstr "设置属性出错：%s\n"
+msgid "Invalid attribute type “%s”"
+msgstr "无效的属性类型“%s”"
#: ../gio/gio-tool-trash.c:32
msgid "Empty the trash"
@@ -2163,7 +2180,7 @@
msgid "List contents of directories in a tree-like format."
msgstr "使用树状格式列出目录内容。"
-#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1491
+#: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1501
#, c-format
msgid "Element <%s> not allowed inside <%s>"
msgstr "在 <%2$s> 中不允许元素 <%1$s>"
@@ -2180,17 +2197,17 @@
#: ../gio/glib-compile-resources.c:248
#, c-format
-msgid "Failed to locate '%s' in any source directory"
+msgid "Failed to locate “%s” in any source directory"
msgstr "在所有源目录中定位“%s”失败"
#: ../gio/glib-compile-resources.c:259
#, c-format
-msgid "Failed to locate '%s' in current directory"
+msgid "Failed to locate “%s” in current directory"
msgstr "在当前目录定位“%s”失败"
#: ../gio/glib-compile-resources.c:290
#, c-format
-msgid "Unknown processing option \"%s\""
+msgid "Unknown processing option “%s”"
msgstr "未知的处理选项“%s”"
#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
@@ -2208,64 +2225,68 @@
msgid "Error compressing file %s"
msgstr "压缩文件时出错：%s"
-#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603
+#: ../gio/glib-compile-resources.c:469
#, c-format
msgid "text may not appear inside <%s>"
msgstr "<%s> 内不应出现文本"
-#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-resources.c:664 ../gio/glib-compile-schemas.c:2067
msgid "Show program version and exit"
msgstr "显示程序版本并退出"
-#: ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:665
msgid "name of the output file"
msgstr "输出文件名"
-#: ../gio/glib-compile-resources.c:623
+#: ../gio/glib-compile-resources.c:666
msgid ""
"The directories where files are to be read from (default to current "
"directory)"
msgstr "文件会被读出的目录(默认为当前目录)"
-#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
-#: ../gio/glib-compile-schemas.c:2067
+#: ../gio/glib-compile-resources.c:666 ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2096
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: ../gio/glib-compile-resources.c:624
+#: ../gio/glib-compile-resources.c:667
msgid ""
"Generate output in the format selected for by the target filename extension"
msgstr "以目标文件扩展名所选择的格式生成输出"
-#: ../gio/glib-compile-resources.c:625
+#: ../gio/glib-compile-resources.c:668
msgid "Generate source header"
msgstr "生成源码头文件"
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:669
msgid "Generate sourcecode used to link in the resource file into your code"
msgstr "生成用于将资源文件链接到您的代码的源代码"
-#: ../gio/glib-compile-resources.c:627
+#: ../gio/glib-compile-resources.c:670
msgid "Generate dependency list"
msgstr "生成依赖关系列表"
-#: ../gio/glib-compile-resources.c:628
+#: ../gio/glib-compile-resources.c:671
msgid "name of the dependency file to generate"
msgstr "要生成的依赖文件名称"
-#: ../gio/glib-compile-resources.c:629
-msgid "Don't automatically create and register resource"
+#: ../gio/glib-compile-resources.c:672
+msgid "Include phony targets in the generated dependency file"
+msgstr "在生成的依赖关系文件中包含伪目标"
+
+#: ../gio/glib-compile-resources.c:673
+msgid "Don’t automatically create and register resource"
msgstr "不要自动创建和注册资源"
-#: ../gio/glib-compile-resources.c:630
-msgid "Don't export functions; declare them G_GNUC_INTERNAL"
+#: ../gio/glib-compile-resources.c:674
+msgid "Don’t export functions; declare them G_GNUC_INTERNAL"
msgstr "不要导出函数；请将它们声明为 G_GNUC_INTERNAL"
-#: ../gio/glib-compile-resources.c:631
+#: ../gio/glib-compile-resources.c:675
msgid "C identifier name used for the generated source code"
msgstr "用于生成的源代码的 C 标识符名称"
-#: ../gio/glib-compile-resources.c:657
+#: ../gio/glib-compile-resources.c:701
msgid ""
"Compile a resource specification into a resource file.\n"
"Resource specification files have the extension .gresource.xml,\n"
@@ -2275,57 +2296,230 @@
"资源规格文件以 .gresource.xml 为扩展名，\n"
"资源文件以 .gresource 为扩展名。"
-#: ../gio/glib-compile-resources.c:679
+#: ../gio/glib-compile-resources.c:723
#, c-format
msgid "You should give exactly one file name\n"
msgstr "您应该给出惟一的文件名\n"
-#: ../gio/glib-compile-schemas.c:784
-msgid "empty names are not permitted"
-msgstr "不允许空名称"
-
-#: ../gio/glib-compile-schemas.c:794
+#: ../gio/glib-compile-schemas.c:95
#, c-format
-msgid "invalid name '%s': names must begin with a lowercase letter"
-msgstr "无效名称 %s：名称必须以小写字母开始"
+msgid "nick must be a minimum of 2 characters"
+msgstr ""
-#: ../gio/glib-compile-schemas.c:806
+#: ../gio/glib-compile-schemas.c:106
+#, fuzzy, c-format
+#| msgid "Invalid symlink value given"
+msgid "Invalid numeric value"
+msgstr "给出的符号链接值无效"
+
+#: ../gio/glib-compile-schemas.c:114
+#, fuzzy, c-format
+#| msgid "<%s id='%s'> already specified"
+msgid "<value nick='%s'/> already specified"
+msgstr "<%s id='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:122
+#, fuzzy, c-format
+#| msgid "<key name='%s'> already specified"
+msgid "value='%s' already specified"
+msgstr "<key name='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:136
+#, c-format
+msgid "flags values must have at most 1 bit set"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:161
+#, c-format
+msgid "<%s> must contain at least one <value>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:315
+#, fuzzy, c-format
+#| msgid "No connection endpoint specified"
+msgid "<%s> is not contained in the specified range"
+msgstr "没有指定连接的端点"
+
+#: ../gio/glib-compile-schemas.c:327
+#, c-format
+msgid "<%s> is not a valid member of the specified enumerated type"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:333
+#, c-format
+msgid "<%s> contains string not in the specified flags type"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:339
+#, c-format
+msgid "<%s> contains a string not in <choices>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:373
+#, fuzzy
+#| msgid "<key name='%s'> already specified"
+msgid "<range/> already specified for this key"
+msgstr "<key name='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:391
+#, c-format
+msgid "<range> not allowed for keys of type “%s”"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:408
+#, c-format
+msgid "<range> specified minimum is greater than maximum"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:433
+#, c-format
+msgid "unsupported l10n category: %s"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:441
+msgid "l10n requested, but no gettext domain given"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:453
+msgid "translation context given for value without l10n enabled"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:475
+#, fuzzy, c-format
+#| msgid "Failed to create file “%s”: %s"
+msgid "Failed to parse <default> value of type “%s”: "
+msgstr "创建文件“%s”失败：%s"
+
+#: ../gio/glib-compile-schemas.c:492
+msgid ""
+"<choices> cannot be specified for keys tagged as having an enumerated type"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:501
+#, fuzzy
+#| msgid "<child name='%s'> already specified"
+msgid "<choices> already specified for this key"
+msgstr "<child name='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:513
+#, c-format
+msgid "<choices> not allowed for keys of type “%s”"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:529
+#, fuzzy, c-format
+#| msgid "<child name='%s'> already specified"
+msgid "<choice value='%s'/> already given"
+msgstr "<child name='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:544
+#, c-format
+msgid "<choices> must contain at least one <choice>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:558
+#, fuzzy
+#| msgid "<child name='%s'> already specified"
+msgid "<aliases> already specified for this key"
+msgstr "<child name='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:562
+msgid ""
+"<aliases> can only be specified for keys with enumerated or flags types or "
+"after <choices>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:581
#, c-format
msgid ""
-"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
-"and hyphen ('-') are permitted."
+"<alias value='%s'/> given when “%s” is already a member of the enumerated "
+"type"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:587
+#, c-format
+msgid "<alias value='%s'/> given when <choice value='%s'/> was already given"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:595
+#, fuzzy, c-format
+#| msgid "<%s id='%s'> already specified"
+msgid "<alias value='%s'/> already specified"
+msgstr "<%s id='%s'> 已指定"
+
+#: ../gio/glib-compile-schemas.c:605
+#, fuzzy, c-format
+#| msgid "“%s” is not a signed number"
+msgid "alias target “%s” is not in enumerated type"
+msgstr "“%s”不是有效的有符号数值"
+
+#: ../gio/glib-compile-schemas.c:606
+#, c-format
+msgid "alias target “%s” is not in <choices>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:621
+#, c-format
+msgid "<aliases> must contain at least one <alias>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:786
+#, fuzzy
+#| msgid "empty names are not permitted"
+msgid "Empty names are not permitted"
+msgstr "不允许空名称"
+
+#: ../gio/glib-compile-schemas.c:796
+#, fuzzy, c-format
+#| msgid "invalid name '%s': names must begin with a lowercase letter"
+msgid "Invalid name “%s”: names must begin with a lowercase letter"
+msgstr "无效名称 %s：名称必须以小写字母开始"
+
+#: ../gio/glib-compile-schemas.c:808
+#, fuzzy, c-format
+#| msgid ""
+#| "invalid name '%s': invalid character '%c'; only lowercase letters, "
+#| "numbers and hyphen ('-') are permitted."
+msgid ""
+"Invalid name “%s”: invalid character “%c”; only lowercase letters, numbers "
+"and hyphen (“-”) are permitted"
msgstr "无效名称 %s：无效的字符 %c，仅允许使用小写字母、数字和边字符(“-”)。"
-#: ../gio/glib-compile-schemas.c:815
-#, c-format
-msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
+#: ../gio/glib-compile-schemas.c:817
+#, fuzzy, c-format
+#| msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
+msgid "Invalid name “%s”: two successive hyphens (“--”) are not permitted"
msgstr "无效名称 %s：不允许使用连续的连字符(“--”)。"
-#: ../gio/glib-compile-schemas.c:824
-#, c-format
-msgid "invalid name '%s': the last character may not be a hyphen ('-')."
+#: ../gio/glib-compile-schemas.c:826
+#, fuzzy, c-format
+#| msgid "invalid name '%s': the last character may not be a hyphen ('-')."
+msgid "Invalid name “%s”: the last character may not be a hyphen (“-”)"
msgstr "无效名称 %s：最后一个字符串不应为连字符(“-”)。"
-#: ../gio/glib-compile-schemas.c:832
-#, c-format
-msgid "invalid name '%s': maximum length is 1024"
+#: ../gio/glib-compile-schemas.c:834
+#, fuzzy, c-format
+#| msgid "invalid name '%s': maximum length is 1024"
+msgid "Invalid name “%s”: maximum length is 1024"
msgstr "无效名称 %s：最大长度为 1024"
-#: ../gio/glib-compile-schemas.c:901
+#: ../gio/glib-compile-schemas.c:904
#, c-format
msgid "<child name='%s'> already specified"
msgstr "<child name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:927
-msgid "cannot add keys to a 'list-of' schema"
+#: ../gio/glib-compile-schemas.c:930
+#, fuzzy
+#| msgid "cannot add keys to a 'list-of' schema"
+msgid "Cannot add keys to a “list-of” schema"
msgstr "无法添加键到一个 list-of 方案"
-#: ../gio/glib-compile-schemas.c:938
+#: ../gio/glib-compile-schemas.c:941
#, c-format
msgid "<key name='%s'> already specified"
msgstr "<key name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:956
+#: ../gio/glib-compile-schemas.c:959
#, c-format
msgid ""
"<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -2334,178 +2528,216 @@
"<key name='%s'> 与 <key name='%s'> 在 <schema id='%s'> 重合; 请使用 "
"<override> 修改其值。"
-#: ../gio/glib-compile-schemas.c:967
-#, c-format
+#: ../gio/glib-compile-schemas.c:970
+#, fuzzy, c-format
+#| msgid ""
+#| "exactly one of 'type', 'enum' or 'flags' must be specified as an "
+#| "attribute to <key>"
msgid ""
-"exactly one of 'type', 'enum' or 'flags' must be specified as an attribute "
+"Exactly one of “type”, “enum” or “flags” must be specified as an attribute "
"to <key>"
msgstr "type、enum 或 flags 中必须有一个被指定为 <key> 的属性。"
-#: ../gio/glib-compile-schemas.c:986
+#: ../gio/glib-compile-schemas.c:989
#, c-format
msgid "<%s id='%s'> not (yet) defined."
msgstr "<%s id='%s'> 尚未定义。"
-#: ../gio/glib-compile-schemas.c:1001
-#, c-format
-msgid "invalid GVariant type string '%s'"
+#: ../gio/glib-compile-schemas.c:1004
+#, fuzzy, c-format
+#| msgid "invalid GVariant type string '%s'"
+msgid "Invalid GVariant type string “%s”"
msgstr "无效的 GVariant 类型字符串 %s"
-#: ../gio/glib-compile-schemas.c:1031
-msgid "<override> given but schema isn't extending anything"
+#: ../gio/glib-compile-schemas.c:1034
+#, fuzzy
+#| msgid "<override> given but schema isn't extending anything"
+msgid "<override> given but schema isn’t extending anything"
msgstr "给出了 <override> 但方案并未扩展"
-#: ../gio/glib-compile-schemas.c:1044
-#, c-format
-msgid "no <key name='%s'> to override"
+#: ../gio/glib-compile-schemas.c:1047
+#, fuzzy, c-format
+#| msgid "no <key name='%s'> to override"
+msgid "No <key name='%s'> to override"
msgstr "无 <key name='%s'> 可覆盖"
-#: ../gio/glib-compile-schemas.c:1052
+#: ../gio/glib-compile-schemas.c:1055
#, c-format
msgid "<override name='%s'> already specified"
msgstr "<override name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:1125
+#: ../gio/glib-compile-schemas.c:1128
#, c-format
msgid "<schema id='%s'> already specified"
msgstr "<schema id='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:1137
-#, c-format
-msgid "<schema id='%s'> extends not yet existing schema '%s'"
+#: ../gio/glib-compile-schemas.c:1140
+#, fuzzy, c-format
+#| msgid "<schema id='%s'> extends not yet existing schema '%s'"
+msgid "<schema id='%s'> extends not yet existing schema “%s”"
msgstr "<schema id='%s'> 扩展了尚不存在的方案 %s"
-#: ../gio/glib-compile-schemas.c:1153
-#, c-format
-msgid "<schema id='%s'> is list of not yet existing schema '%s'"
+#: ../gio/glib-compile-schemas.c:1156
+#, fuzzy, c-format
+#| msgid "<schema id='%s'> is list of not yet existing schema '%s'"
+msgid "<schema id='%s'> is list of not yet existing schema “%s”"
msgstr "<schema id='%s'> 是尚不存在的方案 %s 的列表"
-#: ../gio/glib-compile-schemas.c:1161
-#, c-format
-msgid "Can not be a list of a schema with a path"
+#: ../gio/glib-compile-schemas.c:1164
+#, fuzzy, c-format
+#| msgid "Can not be a list of a schema with a path"
+msgid "Cannot be a list of a schema with a path"
msgstr "不能是一系列带有路径的方案"
-#: ../gio/glib-compile-schemas.c:1171
-#, c-format
-msgid "Can not extend a schema with a path"
+#: ../gio/glib-compile-schemas.c:1174
+#, fuzzy, c-format
+#| msgid "Can not extend a schema with a path"
+msgid "Cannot extend a schema with a path"
msgstr "无法使用路径扩展方案"
-#: ../gio/glib-compile-schemas.c:1181
+#: ../gio/glib-compile-schemas.c:1184
#, c-format
msgid ""
"<schema id='%s'> is a list, extending <schema id='%s'> which is not a list"
msgstr "<schema id='%s'> 是一个列表，扩展的 <schema id='%s'> 不是列表"
-#: ../gio/glib-compile-schemas.c:1191
-#, c-format
+#: ../gio/glib-compile-schemas.c:1194
+#, fuzzy, c-format
+#| msgid ""
+#| "<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but "
+#| "'%s' does not extend '%s'"
msgid ""
-"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
-"does not extend '%s'"
+"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but “%s” "
+"does not extend “%s”"
msgstr ""
"<schema id='%s' list-of='%s'> 扩展 <schema id='%s' list-of='%s'>，但“%s”不扩"
"展 %s"
-#: ../gio/glib-compile-schemas.c:1208
-#, c-format
-msgid "a path, if given, must begin and end with a slash"
+#: ../gio/glib-compile-schemas.c:1211
+#, fuzzy, c-format
+#| msgid "a path, if given, must begin and end with a slash"
+msgid "A path, if given, must begin and end with a slash"
msgstr "一个路径，如果给出则必须以斜线(/)开始和结束"
-#: ../gio/glib-compile-schemas.c:1215
-#, c-format
-msgid "the path of a list must end with ':/'"
+#: ../gio/glib-compile-schemas.c:1218
+#, fuzzy, c-format
+#| msgid "the path of a list must end with ':/'"
+msgid "The path of a list must end with “:/”"
msgstr "一个列表的路径必须以 :/ 结束"
-#: ../gio/glib-compile-schemas.c:1247
+#: ../gio/glib-compile-schemas.c:1227
+#, c-format
+msgid ""
+"Warning: Schema “%s” has path “%s”. Paths starting with “/apps/”, “/"
+"desktop/” or “/system/” are deprecated."
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:1257
#, c-format
msgid "<%s id='%s'> already specified"
msgstr "<%s id='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:1397 ../gio/glib-compile-schemas.c:1413
+#: ../gio/glib-compile-schemas.c:1407 ../gio/glib-compile-schemas.c:1423
#, c-format
msgid "Only one <%s> element allowed inside <%s>"
msgstr "在 <%2$s> 中仅允许一个成员 <%1$s>"
-#: ../gio/glib-compile-schemas.c:1495
+#: ../gio/glib-compile-schemas.c:1505
#, c-format
msgid "Element <%s> not allowed at the top level"
msgstr "顶层中不允许元素 <%s>"
+#: ../gio/glib-compile-schemas.c:1523
+msgid "Element <default> is required in <key>"
+msgstr ""
+
+#: ../gio/glib-compile-schemas.c:1613
+#, fuzzy, c-format
+#| msgid "text may not appear inside <%s>"
+msgid "Text may not appear inside <%s>"
+msgstr "<%s> 内不应出现文本"
+
+#: ../gio/glib-compile-schemas.c:1681
+#, c-format
+msgid "Warning: undefined reference to <schema id='%s'/>"
+msgstr ""
+
#. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1794 ../gio/glib-compile-schemas.c:1865
-#: ../gio/glib-compile-schemas.c:1941
+#: ../gio/glib-compile-schemas.c:1820 ../gio/glib-compile-schemas.c:1894
+#: ../gio/glib-compile-schemas.c:1970
#, c-format
msgid "--strict was specified; exiting.\n"
msgstr "指定了 --strict；退出。\n"
-#: ../gio/glib-compile-schemas.c:1802
+#: ../gio/glib-compile-schemas.c:1830
#, c-format
msgid "This entire file has been ignored.\n"
msgstr "整个文件被忽略。\n"
-#: ../gio/glib-compile-schemas.c:1861
+#: ../gio/glib-compile-schemas.c:1890
#, c-format
msgid "Ignoring this file.\n"
msgstr "忽略此文件。\n"
-#: ../gio/glib-compile-schemas.c:1901
+#: ../gio/glib-compile-schemas.c:1930
#, c-format
msgid "No such key '%s' in schema '%s' as specified in override file '%s'"
msgstr "覆盖文件 %3$s 中指定的方案 %2$s 中没有键 %1$s"
-#: ../gio/glib-compile-schemas.c:1907 ../gio/glib-compile-schemas.c:1965
-#: ../gio/glib-compile-schemas.c:1993
+#: ../gio/glib-compile-schemas.c:1936 ../gio/glib-compile-schemas.c:1994
+#: ../gio/glib-compile-schemas.c:2022
#, c-format
msgid "; ignoring override for this key.\n"
msgstr "；忽略对此键的覆盖。\n"
-#: ../gio/glib-compile-schemas.c:1911 ../gio/glib-compile-schemas.c:1969
-#: ../gio/glib-compile-schemas.c:1997
+#: ../gio/glib-compile-schemas.c:1940 ../gio/glib-compile-schemas.c:1998
+#: ../gio/glib-compile-schemas.c:2026
#, c-format
msgid " and --strict was specified; exiting.\n"
msgstr "并且指定了 --strict；退出。\n"
-#: ../gio/glib-compile-schemas.c:1927
+#: ../gio/glib-compile-schemas.c:1956
#, c-format
msgid ""
"error parsing key '%s' in schema '%s' as specified in override file '%s': %s."
msgstr "解析覆盖文件 %3$s 中指定的方案 %2$s 中的键 %1$s 出错：%4$s。"
-#: ../gio/glib-compile-schemas.c:1937
+#: ../gio/glib-compile-schemas.c:1966
#, c-format
msgid "Ignoring override for this key.\n"
msgstr "忽略对此键的覆盖。\n"
-#: ../gio/glib-compile-schemas.c:1955
+#: ../gio/glib-compile-schemas.c:1984
#, c-format
msgid ""
"override for key '%s' in schema '%s' in override file '%s' is outside the "
"range given in the schema"
msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖超出了方案给出的范围"
-#: ../gio/glib-compile-schemas.c:1983
+#: ../gio/glib-compile-schemas.c:2012
#, c-format
msgid ""
"override for key '%s' in schema '%s' in override file '%s' is not in the "
"list of valid choices"
msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效值列表内"
-#: ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-schemas.c:2068
msgid "where to store the gschemas.compiled file"
msgstr "gschemas.compiled 文件存储于何处"
-#: ../gio/glib-compile-schemas.c:2039
+#: ../gio/glib-compile-schemas.c:2069
msgid "Abort on any errors in schemas"
msgstr "在方案出现任何错误时中止"
-#: ../gio/glib-compile-schemas.c:2040
+#: ../gio/glib-compile-schemas.c:2070
msgid "Do not write the gschema.compiled file"
msgstr "不要对 gschema.compiled 进行写操作"
-#: ../gio/glib-compile-schemas.c:2041
+#: ../gio/glib-compile-schemas.c:2071
msgid "Do not enforce key name restrictions"
msgstr "不要强制键名的限制"
-#: ../gio/glib-compile-schemas.c:2070
+#: ../gio/glib-compile-schemas.c:2099
msgid ""
"Compile all GSettings schema files into a schema cache.\n"
"Schema files are required to have the extension .gschema.xml,\n"
@@ -2515,247 +2747,251 @@
"要使用扩展 .gschema.xml，需要有方案文件，\n"
"缓存文件被称为 gschemas.compiled。"
-#: ../gio/glib-compile-schemas.c:2092
+#: ../gio/glib-compile-schemas.c:2120
#, c-format
msgid "You should give exactly one directory name\n"
msgstr "您应该给出且只能给出一个目录名\n"
-#: ../gio/glib-compile-schemas.c:2131
+#: ../gio/glib-compile-schemas.c:2162
#, c-format
msgid "No schema files found: "
msgstr "没有找到方案文件："
-#: ../gio/glib-compile-schemas.c:2134
+#: ../gio/glib-compile-schemas.c:2165
#, c-format
msgid "doing nothing.\n"
msgstr "什么都没做。\n"
-#: ../gio/glib-compile-schemas.c:2137
+#: ../gio/glib-compile-schemas.c:2168
#, c-format
msgid "removed existing output file.\n"
msgstr "已删除存在的输出文件。\n"
-#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:643 ../gio/win32/gwinhttpfile.c:420
#, c-format
msgid "Invalid filename %s"
msgstr "无效的文件名 %s"
-#: ../gio/glocalfile.c:1036
+#: ../gio/glocalfile.c:1037
#, c-format
msgid "Error getting filesystem info for %s: %s"
msgstr "读取 %s 文件系统信息时出错：%s"
-#: ../gio/glocalfile.c:1175
+#. Translators: This is an error message when trying to find
+#. * the enclosing (user visible) mount of a file, but none
+#. * exists.
+#.
+#: ../gio/glocalfile.c:1176
#, c-format
msgid "Containing mount for file %s not found"
msgstr "找不到文件 %s 包含的挂载"
-#: ../gio/glocalfile.c:1198
-msgid "Can't rename root directory"
+#: ../gio/glocalfile.c:1199
+msgid "Can’t rename root directory"
msgstr "无法重命名根目录"
-#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239
+#: ../gio/glocalfile.c:1217 ../gio/glocalfile.c:1240
#, c-format
msgid "Error renaming file %s: %s"
msgstr "重命名文件 %s 时出错：%s"
-#: ../gio/glocalfile.c:1223
-msgid "Can't rename file, filename already exists"
+#: ../gio/glocalfile.c:1224
+msgid "Can’t rename file, filename already exists"
msgstr "无法重命名文件，该文件名已存在"
-#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278
-#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1237 ../gio/glocalfile.c:2253 ../gio/glocalfile.c:2281
+#: ../gio/glocalfile.c:2438 ../gio/glocalfileoutputstream.c:549
msgid "Invalid filename"
msgstr "无效的文件名"
-#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418
+#: ../gio/glocalfile.c:1404 ../gio/glocalfile.c:1419
#, c-format
msgid "Error opening file %s: %s"
msgstr "打开文件 %s 时出错：%s"
-#: ../gio/glocalfile.c:1543
+#: ../gio/glocalfile.c:1544
#, c-format
msgid "Error removing file %s: %s"
msgstr "删除文件 %s 时出错：%s"
-#: ../gio/glocalfile.c:1926
+#: ../gio/glocalfile.c:1928
#, c-format
msgid "Error trashing file %s: %s"
msgstr "将文件 %s 放到回收站时出错：%s"
-#: ../gio/glocalfile.c:1949
+#: ../gio/glocalfile.c:1951
#, c-format
msgid "Unable to create trash dir %s: %s"
msgstr "无法创建回收站目录 %s：%s"
-#: ../gio/glocalfile.c:1969
+#: ../gio/glocalfile.c:1971
#, c-format
msgid "Unable to find toplevel directory to trash %s"
msgstr "找不到回收站 %s 的顶级目录"
-#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068
+#: ../gio/glocalfile.c:2050 ../gio/glocalfile.c:2070
#, c-format
msgid "Unable to find or create trash directory for %s"
msgstr "无法为 %s 找到或创建回收站目录"
-#: ../gio/glocalfile.c:2102
+#: ../gio/glocalfile.c:2105
#, c-format
msgid "Unable to create trashing info file for %s: %s"
msgstr "为 %s 创建回收站信息文件失败：%s"
-#: ../gio/glocalfile.c:2161
+#: ../gio/glocalfile.c:2164
#, c-format
msgid "Unable to trash file %s across filesystem boundaries"
msgstr "无法跨越文件系统边界将文件 %s 移动到回收站"
-#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221
+#: ../gio/glocalfile.c:2168 ../gio/glocalfile.c:2224
#, c-format
msgid "Unable to trash file %s: %s"
msgstr "无法将文件 %s 移动到回收站：%s"
-#: ../gio/glocalfile.c:2227
+#: ../gio/glocalfile.c:2230
#, c-format
msgid "Unable to trash file %s"
msgstr "无法将文件 %s 移动到回收站"
-#: ../gio/glocalfile.c:2253
+#: ../gio/glocalfile.c:2256
#, c-format
msgid "Error creating directory %s: %s"
msgstr "创建目录 %s 时出错：%s"
-#: ../gio/glocalfile.c:2282
+#: ../gio/glocalfile.c:2285
#, c-format
msgid "Filesystem does not support symbolic links"
msgstr "文件系统不支持符号链接"
-#: ../gio/glocalfile.c:2285
+#: ../gio/glocalfile.c:2288
#, c-format
msgid "Error making symbolic link %s: %s"
msgstr "创建符号链接 %s 时出错：%s"
-#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064
+#: ../gio/glocalfile.c:2294 ../glib/gfileutils.c:2096
msgid "Symbolic links not supported"
msgstr "不支持符号链接"
-#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438
+#: ../gio/glocalfile.c:2349 ../gio/glocalfile.c:2384 ../gio/glocalfile.c:2441
#, c-format
msgid "Error moving file %s: %s"
msgstr "移动文件 %s 时出错：%s"
-#: ../gio/glocalfile.c:2369
-msgid "Can't move directory over directory"
+#: ../gio/glocalfile.c:2372
+msgid "Can’t move directory over directory"
msgstr "无法将目录移动到目录"
-#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925
-#: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954
-#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985
+#: ../gio/glocalfile.c:2398 ../gio/glocalfileoutputstream.c:933
+#: ../gio/glocalfileoutputstream.c:947 ../gio/glocalfileoutputstream.c:962
+#: ../gio/glocalfileoutputstream.c:979 ../gio/glocalfileoutputstream.c:993
msgid "Backup file creation failed"
msgstr "备份文件创建失败"
-#: ../gio/glocalfile.c:2414
+#: ../gio/glocalfile.c:2417
#, c-format
msgid "Error removing target file: %s"
msgstr "移除目标文件出错：%s"
-#: ../gio/glocalfile.c:2428
+#: ../gio/glocalfile.c:2431
msgid "Move between mounts not supported"
msgstr "不支持在挂载之间移动"
-#: ../gio/glocalfile.c:2619
+#: ../gio/glocalfile.c:2622
#, c-format
msgid "Could not determine the disk usage of %s: %s"
msgstr "无法确定 %s 的磁盘使用情况：%s"
-#: ../gio/glocalfileinfo.c:721
+#: ../gio/glocalfileinfo.c:731
msgid "Attribute value must be non-NULL"
msgstr "属性值必须为非空"
-#: ../gio/glocalfileinfo.c:728
+#: ../gio/glocalfileinfo.c:738
msgid "Invalid attribute type (string expected)"
msgstr "无效的属性类型(应为 string)"
-#: ../gio/glocalfileinfo.c:735
+#: ../gio/glocalfileinfo.c:745
msgid "Invalid extended attribute name"
msgstr "无效的扩展属性名"
-#: ../gio/glocalfileinfo.c:775
+#: ../gio/glocalfileinfo.c:785
#, c-format
-msgid "Error setting extended attribute '%s': %s"
+msgid "Error setting extended attribute “%s”: %s"
msgstr "设置扩展属性“%s”时出错：%s"
-#: ../gio/glocalfileinfo.c:1575
+#: ../gio/glocalfileinfo.c:1586
msgid " (invalid encoding)"
msgstr " (无效的编码)"
-#: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
+#: ../gio/glocalfileinfo.c:1777 ../gio/glocalfileoutputstream.c:811
#, c-format
-msgid "Error when getting information for file '%s': %s"
+msgid "Error when getting information for file “%s”: %s"
msgstr "获取文件“%s”的信息时出错：%s"
-#: ../gio/glocalfileinfo.c:2017
+#: ../gio/glocalfileinfo.c:2028
#, c-format
msgid "Error when getting information for file descriptor: %s"
msgstr "获取文件描述符的信息时出错：%s"
-#: ../gio/glocalfileinfo.c:2062
+#: ../gio/glocalfileinfo.c:2073
msgid "Invalid attribute type (uint32 expected)"
msgstr "无效的属性类型(应为 uint32)"
-#: ../gio/glocalfileinfo.c:2080
+#: ../gio/glocalfileinfo.c:2091
msgid "Invalid attribute type (uint64 expected)"
msgstr "无效的属性类型(应为 uint64)"
-#: ../gio/glocalfileinfo.c:2099 ../gio/glocalfileinfo.c:2118
+#: ../gio/glocalfileinfo.c:2110 ../gio/glocalfileinfo.c:2129
msgid "Invalid attribute type (byte string expected)"
msgstr "无效的属性类型(应为 byte string)"
-#: ../gio/glocalfileinfo.c:2153
+#: ../gio/glocalfileinfo.c:2164
msgid "Cannot set permissions on symlinks"
msgstr "无法为符号链设置权限"
-#: ../gio/glocalfileinfo.c:2169
+#: ../gio/glocalfileinfo.c:2180
#, c-format
msgid "Error setting permissions: %s"
msgstr "设置访问权限出错：%s"
-#: ../gio/glocalfileinfo.c:2220
+#: ../gio/glocalfileinfo.c:2231
#, c-format
msgid "Error setting owner: %s"
msgstr "设置所有者出错：%s"
-#: ../gio/glocalfileinfo.c:2243
+#: ../gio/glocalfileinfo.c:2254
msgid "symlink must be non-NULL"
msgstr "符号链接必须是非空"
-#: ../gio/glocalfileinfo.c:2253 ../gio/glocalfileinfo.c:2272
-#: ../gio/glocalfileinfo.c:2283
+#: ../gio/glocalfileinfo.c:2264 ../gio/glocalfileinfo.c:2283
+#: ../gio/glocalfileinfo.c:2294
#, c-format
msgid "Error setting symlink: %s"
msgstr "设置符号链接出错：%s"
-#: ../gio/glocalfileinfo.c:2262
+#: ../gio/glocalfileinfo.c:2273
msgid "Error setting symlink: file is not a symlink"
msgstr "设定符号链接出错：文件不是符号链接"
-#: ../gio/glocalfileinfo.c:2388
+#: ../gio/glocalfileinfo.c:2399
#, c-format
msgid "Error setting modification or access time: %s"
msgstr "错误设置修改或访问时间：%s"
-#: ../gio/glocalfileinfo.c:2411
+#: ../gio/glocalfileinfo.c:2422
msgid "SELinux context must be non-NULL"
msgstr "SELinux 上下文必须是非空"
-#: ../gio/glocalfileinfo.c:2426
+#: ../gio/glocalfileinfo.c:2437
#, c-format
msgid "Error setting SELinux context: %s"
msgstr "设置 SELinux 上下文出错：%s"
-#: ../gio/glocalfileinfo.c:2433
+#: ../gio/glocalfileinfo.c:2444
msgid "SELinux is not enabled on this system"
msgstr "此系统尚未启用 SELinux"
-#: ../gio/glocalfileinfo.c:2525
+#: ../gio/glocalfileinfo.c:2536
#, c-format
msgid "Setting attribute %s not supported"
msgstr "不支持设置属性 %s"
@@ -2767,7 +3003,7 @@
#: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
#: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003
+#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1011
#, c-format
msgid "Error seeking in file: %s"
msgstr "在文件中定位时出错：%s"
@@ -2803,30 +3039,30 @@
msgid "Error renaming temporary file: %s"
msgstr "重命名临时文件出错：%s"
-#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054
+#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1062
#, c-format
msgid "Error truncating file: %s"
msgstr "截断文件出错：%s"
-#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
-#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
+#: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:793
+#: ../gio/glocalfileoutputstream.c:1043 ../gio/gsubprocess.c:380
#, c-format
-msgid "Error opening file '%s': %s"
-msgstr "打开文件“%s”时出错：%s"
+msgid "Error opening file “%s”: %s"
+msgstr "打开文件“%s”出错：%s"
-#: ../gio/glocalfileoutputstream.c:816
+#: ../gio/glocalfileoutputstream.c:824
msgid "Target file is a directory"
msgstr "目标文件是目录"
-#: ../gio/glocalfileoutputstream.c:821
+#: ../gio/glocalfileoutputstream.c:829
msgid "Target file is not a regular file"
msgstr "目标文件不是普通文件"
-#: ../gio/glocalfileoutputstream.c:833
+#: ../gio/glocalfileoutputstream.c:841
msgid "The file was externally modified"
msgstr "文件已经被其他程序修改"
-#: ../gio/glocalfileoutputstream.c:1019
+#: ../gio/glocalfileoutputstream.c:1027
#, c-format
msgid "Error removing old file: %s"
msgstr "移除旧文件出错：%s"
@@ -2868,55 +3104,55 @@
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement unmount.
-#: ../gio/gmount.c:393
-msgid "mount doesn't implement \"unmount\""
+#: ../gio/gmount.c:396
+msgid "mount doesn’t implement “unmount”"
msgstr "挂载未实现“unmount”"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement eject.
-#: ../gio/gmount.c:469
-msgid "mount doesn't implement \"eject\""
+#: ../gio/gmount.c:472
+msgid "mount doesn’t implement “eject”"
msgstr "挂载未实现“eject”"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement any of unmount or unmount_with_operation.
-#: ../gio/gmount.c:547
-msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
+#: ../gio/gmount.c:550
+msgid "mount doesn’t implement “unmount” or “unmount_with_operation”"
msgstr "挂载未实现“unmount”或“unmount_with_operation”"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement any of eject or eject_with_operation.
-#: ../gio/gmount.c:632
-msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+#: ../gio/gmount.c:635
+msgid "mount doesn’t implement “eject” or “eject_with_operation”"
msgstr "挂载未实现“eject”或“eject_with_operation”"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement remount.
-#: ../gio/gmount.c:720
-msgid "mount doesn't implement \"remount\""
+#: ../gio/gmount.c:723
+msgid "mount doesn’t implement “remount”"
msgstr "挂载未实现“remount”"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement content type guessing.
-#: ../gio/gmount.c:802
-msgid "mount doesn't implement content type guessing"
+#: ../gio/gmount.c:805
+msgid "mount doesn’t implement content type guessing"
msgstr "挂载未实现内容类型猜测"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement content type guessing.
-#: ../gio/gmount.c:889
-msgid "mount doesn't implement synchronous content type guessing"
+#: ../gio/gmount.c:892
+msgid "mount doesn’t implement synchronous content type guessing"
msgstr "挂载未实现同步内容类型猜测"
#: ../gio/gnetworkaddress.c:378
#, c-format
-msgid "Hostname '%s' contains '[' but not ']'"
+msgid "Hostname “%s” contains “[” but not “]”"
msgstr "主机名“%s”包含“[”但是缺少“]”"
#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
@@ -2941,45 +3177,45 @@
msgid "Could not get network status: "
msgstr "不能获取网络状态： %s"
-#: ../gio/gnetworkmonitornm.c:326
+#: ../gio/gnetworkmonitornm.c:329
#, c-format
msgid "NetworkManager version too old"
msgstr "NetworkManager 版本太老"
#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
-msgid "Output stream doesn't implement write"
+msgid "Output stream doesn’t implement write"
msgstr "输出流未实现写入"
#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
msgid "Source stream is already closed"
msgstr "源流已经关闭"
-#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:342 ../gio/gthreadedresolver.c:116
#: ../gio/gthreadedresolver.c:126
#, c-format
-msgid "Error resolving '%s': %s"
+msgid "Error resolving “%s”: %s"
msgstr "解析“%s”时出错：%s"
-#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863
-#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132
-#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
+#: ../gio/gresource.c:606 ../gio/gresource.c:857 ../gio/gresource.c:874
+#: ../gio/gresource.c:998 ../gio/gresource.c:1070 ../gio/gresource.c:1143
+#: ../gio/gresource.c:1213 ../gio/gresourcefile.c:453
#: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
#, c-format
-msgid "The resource at '%s' does not exist"
+msgid "The resource at “%s” does not exist"
msgstr "位于“%s”的资源不存在"
-#: ../gio/gresource.c:760
+#: ../gio/gresource.c:771
#, c-format
-msgid "The resource at '%s' failed to decompress"
+msgid "The resource at “%s” failed to decompress"
msgstr "解压位于“%s”的资源失败"
#: ../gio/gresourcefile.c:709
#, c-format
-msgid "The resource at '%s' is not a directory"
+msgid "The resource at “%s” is not a directory"
msgstr "“%s”处的资源不是一个目录"
#: ../gio/gresourcefile.c:917
-msgid "Input stream doesn't implement seek"
+msgid "Input stream doesn’t implement seek"
msgstr "输入流未实现定位"
#: ../gio/gresource-tool.c:494
@@ -3028,7 +3264,7 @@
#: ../gio/gresource-tool.c:534
msgid ""
"Usage:\n"
-" gresource [--section SECTION] COMMAND [ARGS...]\n"
+" gresource [--section SECTION] COMMAND [ARGS…]\n"
"\n"
"Commands:\n"
" help Show this information\n"
@@ -3037,7 +3273,7 @@
" details List resources with details\n"
" extract Extract a resource\n"
"\n"
-"Use 'gresource help COMMAND' to get detailed help.\n"
+"Use “gresource help COMMAND” to get detailed help.\n"
"\n"
msgstr ""
"用法：\n"
@@ -3072,7 +3308,7 @@
msgid " SECTION An (optional) elf section name\n"
msgstr " SECTION ELF 段名(可选)\n"
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:654
+#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:656
msgid " COMMAND The (optional) command to explain\n"
msgstr " COMMAND 要解释的命令(可选)\n"
@@ -3105,19 +3341,19 @@
msgstr " PATH 资源路径\n"
#: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:851
+#: ../gio/gsettings-tool.c:853
#, c-format
-msgid "No such schema '%s'\n"
+msgid "No such schema “%s”\n"
msgstr "没有“%s”这个方案\n"
#: ../gio/gsettings-tool.c:57
#, c-format
-msgid "Schema '%s' is not relocatable (path must not be specified)\n"
+msgid "Schema “%s” is not relocatable (path must not be specified)\n"
msgstr "“%s”方案不可重定向(必须指定路径)\n"
#: ../gio/gsettings-tool.c:78
#, c-format
-msgid "Schema '%s' is relocatable (path must be specified)\n"
+msgid "Schema “%s” is relocatable (path must be specified)\n"
msgstr "“%s”方案可重定向(必须指定路径)\n"
#: ../gio/gsettings-tool.c:92
@@ -3140,38 +3376,38 @@
msgid "Path must not contain two adjacent slashes (//)\n"
msgstr "路径中不能包含连续两个斜杠(//)\n"
-#: ../gio/gsettings-tool.c:489
+#: ../gio/gsettings-tool.c:491
#, c-format
msgid "The provided value is outside of the valid range\n"
msgstr "提供的值不在有效范围内\n"
-#: ../gio/gsettings-tool.c:496
+#: ../gio/gsettings-tool.c:498
#, c-format
msgid "The key is not writable\n"
msgstr "键不可写\n"
-#: ../gio/gsettings-tool.c:532
+#: ../gio/gsettings-tool.c:534
msgid "List the installed (non-relocatable) schemas"
msgstr "列出已安装的(不可重分配的)方案"
-#: ../gio/gsettings-tool.c:538
+#: ../gio/gsettings-tool.c:540
msgid "List the installed relocatable schemas"
msgstr "列出安装的可重分配的方案"
-#: ../gio/gsettings-tool.c:544
+#: ../gio/gsettings-tool.c:546
msgid "List the keys in SCHEMA"
msgstr "列出 SCHEMA 中的键"
-#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:551
-#: ../gio/gsettings-tool.c:594
+#: ../gio/gsettings-tool.c:547 ../gio/gsettings-tool.c:553
+#: ../gio/gsettings-tool.c:596
msgid "SCHEMA[:PATH]"
msgstr "SCHEMA[:PATH]"
-#: ../gio/gsettings-tool.c:550
+#: ../gio/gsettings-tool.c:552
msgid "List the children of SCHEMA"
msgstr "列出 SCHEMA 的子对象"
-#: ../gio/gsettings-tool.c:556
+#: ../gio/gsettings-tool.c:558
msgid ""
"List keys and values, recursively\n"
"If no SCHEMA is given, list all keys\n"
@@ -3179,49 +3415,49 @@
"递归列出键和值\n"
"如果没有给出 SCHEMA，列出所有键\n"
-#: ../gio/gsettings-tool.c:558
+#: ../gio/gsettings-tool.c:560
msgid "[SCHEMA[:PATH]]"
msgstr "SCHEMA[:PATH]"
-#: ../gio/gsettings-tool.c:563
+#: ../gio/gsettings-tool.c:565
msgid "Get the value of KEY"
msgstr "获取 KEY 的值"
-#: ../gio/gsettings-tool.c:564 ../gio/gsettings-tool.c:570
-#: ../gio/gsettings-tool.c:576 ../gio/gsettings-tool.c:588
-#: ../gio/gsettings-tool.c:600
+#: ../gio/gsettings-tool.c:566 ../gio/gsettings-tool.c:572
+#: ../gio/gsettings-tool.c:578 ../gio/gsettings-tool.c:590
+#: ../gio/gsettings-tool.c:602
msgid "SCHEMA[:PATH] KEY"
msgstr "SCHEMA[:PATH] KEY"
-#: ../gio/gsettings-tool.c:569
+#: ../gio/gsettings-tool.c:571
msgid "Query the range of valid values for KEY"
msgstr "查询 KEY 的有效值范围"
-#: ../gio/gsettings-tool.c:575
+#: ../gio/gsettings-tool.c:577
msgid "Query the description for KEY"
msgstr "查询 KEY 的描述"
-#: ../gio/gsettings-tool.c:581
+#: ../gio/gsettings-tool.c:583
msgid "Set the value of KEY to VALUE"
msgstr "将 KEY 的值设为 VALUE"
-#: ../gio/gsettings-tool.c:582
+#: ../gio/gsettings-tool.c:584
msgid "SCHEMA[:PATH] KEY VALUE"
msgstr "SCHEMA[:PATH] KEY VALUE"
-#: ../gio/gsettings-tool.c:587
+#: ../gio/gsettings-tool.c:589
msgid "Reset KEY to its default value"
msgstr "将 KEY 重设为默认值"
-#: ../gio/gsettings-tool.c:593
+#: ../gio/gsettings-tool.c:595
msgid "Reset all keys in SCHEMA to their defaults"
msgstr "重置 SCHEMA 中所有键为默认值"
-#: ../gio/gsettings-tool.c:599
+#: ../gio/gsettings-tool.c:601
msgid "Check if KEY is writable"
msgstr "查看 KEY 是否可写"
-#: ../gio/gsettings-tool.c:605
+#: ../gio/gsettings-tool.c:607
msgid ""
"Monitor KEY for changes.\n"
"If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -3231,15 +3467,15 @@
"如果没有指定 KEY，则监视 SCHEMA 中的所有键。\n"
"使用 ^C 停止监视。\n"
-#: ../gio/gsettings-tool.c:608
+#: ../gio/gsettings-tool.c:610
msgid "SCHEMA[:PATH] [KEY]"
msgstr "SCHEMA[:PATH] [KEY]"
-#: ../gio/gsettings-tool.c:620
+#: ../gio/gsettings-tool.c:622
msgid ""
"Usage:\n"
" gsettings --version\n"
-" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
+" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS…]\n"
"\n"
"Commands:\n"
" help Show this information\n"
@@ -3257,7 +3493,7 @@
" writable Check if a key is writable\n"
" monitor Watch for changes\n"
"\n"
-"Use 'gsettings help COMMAND' to get detailed help.\n"
+"Use “gsettings help COMMAND” to get detailed help.\n"
"\n"
msgstr ""
"用法：\n"
@@ -3283,7 +3519,7 @@
"使用 'gsettings help 命令' 查看详细的帮助。\n"
"\n"
-#: ../gio/gsettings-tool.c:644
+#: ../gio/gsettings-tool.c:646
#, c-format
msgid ""
"Usage:\n"
@@ -3298,11 +3534,11 @@
"%s\n"
"\n"
-#: ../gio/gsettings-tool.c:650
+#: ../gio/gsettings-tool.c:652
msgid " SCHEMADIR A directory to search for additional schemas\n"
msgstr " SCHEMADIR 一个用于搜索附加方案的目录\n"
-#: ../gio/gsettings-tool.c:658
+#: ../gio/gsettings-tool.c:660
msgid ""
" SCHEMA The name of the schema\n"
" PATH The path, for relocatable schemas\n"
@@ -3310,176 +3546,212 @@
" SCHEMA 方案的名称\n"
" PATH 可重定向方案的路径\n"
-#: ../gio/gsettings-tool.c:663
+#: ../gio/gsettings-tool.c:665
msgid " KEY The (optional) key within the schema\n"
msgstr " KEY 方案中(可选)的键\n"
-#: ../gio/gsettings-tool.c:667
+#: ../gio/gsettings-tool.c:669
msgid " KEY The key within the schema\n"
msgstr " KEY 方案中的键\n"
-#: ../gio/gsettings-tool.c:671
+#: ../gio/gsettings-tool.c:673
msgid " VALUE The value to set\n"
msgstr " VALUE 要设的值\n"
-#: ../gio/gsettings-tool.c:726
+#: ../gio/gsettings-tool.c:728
#, c-format
msgid "Could not load schemas from %s: %s\n"
msgstr "无法从 %s 加载方案：%s\n"
-#: ../gio/gsettings-tool.c:738
+#: ../gio/gsettings-tool.c:740
#, c-format
msgid "No schemas installed\n"
msgstr "没有安装方案文件\n"
-#: ../gio/gsettings-tool.c:809
+#: ../gio/gsettings-tool.c:811
#, c-format
msgid "Empty schema name given\n"
msgstr "给出了空的大纲名称\n"
-#: ../gio/gsettings-tool.c:864
+#: ../gio/gsettings-tool.c:866
#, c-format
-msgid "No such key '%s'\n"
+msgid "No such key “%s”\n"
msgstr "没有“%s”这个键\n"
-#: ../gio/gsocket.c:364
+#: ../gio/gsocket.c:384
msgid "Invalid socket, not initialized"
msgstr "无效的套接字，尚未初始化"
-#: ../gio/gsocket.c:371
+#: ../gio/gsocket.c:391
#, c-format
msgid "Invalid socket, initialization failed due to: %s"
msgstr "无效的套接字，初始化失败的原因是：%s"
-#: ../gio/gsocket.c:379
+#: ../gio/gsocket.c:399
msgid "Socket is already closed"
msgstr "套接字已经关闭"
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
-#: ../gio/gsocket.c:3952
+#: ../gio/gsocket.c:414 ../gio/gsocket.c:2995 ../gio/gsocket.c:4205
+#: ../gio/gsocket.c:4263
msgid "Socket I/O timed out"
msgstr "套接字 I/O 超时"
-#: ../gio/gsocket.c:526
+#: ../gio/gsocket.c:546
#, c-format
msgid "creating GSocket from fd: %s"
msgstr "从文件描述符创建 GSocket：%s"
-#: ../gio/gsocket.c:554 ../gio/gsocket.c:608 ../gio/gsocket.c:615
+#: ../gio/gsocket.c:575 ../gio/gsocket.c:629 ../gio/gsocket.c:636
#, c-format
msgid "Unable to create socket: %s"
msgstr "无法创建套接字：%s"
-#: ../gio/gsocket.c:608
+#: ../gio/gsocket.c:629
msgid "Unknown family was specified"
msgstr "指定了未知协议族"
-#: ../gio/gsocket.c:615
+#: ../gio/gsocket.c:636
msgid "Unknown protocol was specified"
msgstr "指定了未知协议"
-#: ../gio/gsocket.c:1104
+#: ../gio/gsocket.c:1127
#, c-format
msgid "Cannot use datagram operations on a non-datagram socket."
msgstr "无法在非数据报套接字上使用数据报操作。"
-#: ../gio/gsocket.c:1121
+#: ../gio/gsocket.c:1144
#, c-format
msgid "Cannot use datagram operations on a socket with a timeout set."
msgstr "无法在已设置超时的套接字上使用数据报操作。"
-#: ../gio/gsocket.c:1925
+#: ../gio/gsocket.c:1948
#, c-format
msgid "could not get local address: %s"
msgstr "不能获取本地地址：%s"
-#: ../gio/gsocket.c:1968
+#: ../gio/gsocket.c:1991
#, c-format
msgid "could not get remote address: %s"
msgstr "不能获取远程地址： %s"
-#: ../gio/gsocket.c:2034
+#: ../gio/gsocket.c:2057
#, c-format
msgid "could not listen: %s"
msgstr "无法监听：%s"
-#: ../gio/gsocket.c:2133
+#: ../gio/gsocket.c:2156
#, c-format
msgid "Error binding to address: %s"
msgstr "错误绑定地址：%s"
-#: ../gio/gsocket.c:2248 ../gio/gsocket.c:2285
+#: ../gio/gsocket.c:2214 ../gio/gsocket.c:2251 ../gio/gsocket.c:2361
+#: ../gio/gsocket.c:2379 ../gio/gsocket.c:2449 ../gio/gsocket.c:2507
+#: ../gio/gsocket.c:2525
#, c-format
msgid "Error joining multicast group: %s"
msgstr "加入多播组出错：%s"
-#: ../gio/gsocket.c:2249 ../gio/gsocket.c:2286
+#: ../gio/gsocket.c:2215 ../gio/gsocket.c:2252 ../gio/gsocket.c:2362
+#: ../gio/gsocket.c:2380 ../gio/gsocket.c:2450 ../gio/gsocket.c:2508
+#: ../gio/gsocket.c:2526
#, c-format
msgid "Error leaving multicast group: %s"
msgstr "退出多播组出错：%s"
-#: ../gio/gsocket.c:2250
+#: ../gio/gsocket.c:2216
msgid "No support for source-specific multicast"
msgstr "不支持指定源的多播"
-#: ../gio/gsocket.c:2470
+#: ../gio/gsocket.c:2363
+#, fuzzy
+#| msgid "Unsupported socket address"
+msgid "Unsupported socket family"
+msgstr "不支持的套接字地址"
+
+#: ../gio/gsocket.c:2381
+msgid "source-specific not an IPv4 address"
+msgstr ""
+
+#: ../gio/gsocket.c:2399 ../gio/gsocket.c:2428 ../gio/gsocket.c:2475
+#, c-format
+msgid "Interface not found: %s"
+msgstr ""
+
+#: ../gio/gsocket.c:2415
+#, c-format
+msgid "Interface name too long"
+msgstr ""
+
+#: ../gio/gsocket.c:2451
+#, fuzzy
+#| msgid "No support for source-specific multicast"
+msgid "No support for IPv4 source-specific multicast"
+msgstr "不支持指定源的多播"
+
+#: ../gio/gsocket.c:2509
+#, fuzzy
+#| msgid "No support for source-specific multicast"
+msgid "No support for IPv6 source-specific multicast"
+msgstr "不支持指定源的多播"
+
+#: ../gio/gsocket.c:2718
#, c-format
msgid "Error accepting connection: %s"
msgstr "接受连接时出错：%s"
-#: ../gio/gsocket.c:2593
+#: ../gio/gsocket.c:2839
msgid "Connection in progress"
msgstr "正在连接"
-#: ../gio/gsocket.c:2644
+#: ../gio/gsocket.c:2888
msgid "Unable to get pending error: "
msgstr "无法获取未决的错误："
-#: ../gio/gsocket.c:2816
+#: ../gio/gsocket.c:3058
#, c-format
msgid "Error receiving data: %s"
msgstr "接收数据出错：%s"
-#: ../gio/gsocket.c:3013
+#: ../gio/gsocket.c:3253
#, c-format
msgid "Error sending data: %s"
msgstr "发送数据出错：%s"
-#: ../gio/gsocket.c:3200
+#: ../gio/gsocket.c:3440
#, c-format
msgid "Unable to shutdown socket: %s"
msgstr "无法关闭套接字：%s"
-#: ../gio/gsocket.c:3281
+#: ../gio/gsocket.c:3521
#, c-format
msgid "Error closing socket: %s"
msgstr "关闭套接字出错：%s"
-#: ../gio/gsocket.c:3890
+#: ../gio/gsocket.c:4198
#, c-format
msgid "Waiting for socket condition: %s"
msgstr "等待套接字状态：%s"
-#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
+#: ../gio/gsocket.c:4672 ../gio/gsocket.c:4752 ../gio/gsocket.c:4930
#, c-format
msgid "Error sending message: %s"
msgstr "发送信息出错：%s"
-#: ../gio/gsocket.c:4386
+#: ../gio/gsocket.c:4696
msgid "GSocketControlMessage not supported on Windows"
msgstr "Windows 不支持 GSocketControlMessage"
-#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
+#: ../gio/gsocket.c:5149 ../gio/gsocket.c:5222 ../gio/gsocket.c:5448
#, c-format
msgid "Error receiving message: %s"
msgstr "接受信息出错：%s"
-#: ../gio/gsocket.c:5411
+#: ../gio/gsocket.c:5720
#, c-format
msgid "Unable to read socket credentials: %s"
msgstr "无法读取套接字认证信息：%s"
-#: ../gio/gsocket.c:5420
+#: ../gio/gsocket.c:5729
msgid "g_socket_get_credentials not implemented for this OS"
msgstr "此操作系统上没有实现 g_socket_get_credentials"
@@ -3507,7 +3779,7 @@
#: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
#, c-format
-msgid "Proxy protocol '%s' is not supported."
+msgid "Proxy protocol “%s” is not supported."
msgstr "不支持代理协议“%s”。"
#: ../gio/gsocketlistener.c:218
@@ -3520,7 +3792,7 @@
#: ../gio/gsocks4aproxy.c:118
#, c-format
-msgid "SOCKSv4 does not support IPv6 address '%s'"
+msgid "SOCKSv4 does not support IPv6 address “%s”"
msgstr "SOCKSv4 不支持 IPv6 地址“%s”"
#: ../gio/gsocks4aproxy.c:136
@@ -3529,7 +3801,7 @@
#: ../gio/gsocks4aproxy.c:153
#, c-format
-msgid "Hostname '%s' is too long for SOCKSv4 protocol"
+msgid "Hostname “%s” is too long for SOCKSv4 protocol"
msgstr "主机名“%s”对于 SOCKSv4 协议过长"
#: ../gio/gsocks4aproxy.c:179
@@ -3565,7 +3837,7 @@
#: ../gio/gsocks5proxy.c:286
#, c-format
-msgid "Hostname '%s' is too long for SOCKSv5 protocol"
+msgid "Hostname “%s” is too long for SOCKSv5 protocol"
msgstr "主机名“%s”对于 SOCKSv5 协议过长"
#: ../gio/gsocks5proxy.c:348
@@ -3593,7 +3865,7 @@
msgstr "通过 SOCKSv5 代理连接被拒绝。"
#: ../gio/gsocks5proxy.c:386
-msgid "SOCKSv5 proxy does not support 'connect' command."
+msgid "SOCKSv5 proxy does not support “connect” command."
msgstr "SOCKSv5 代理不支持“connect”命令。"
#: ../gio/gsocks5proxy.c:392
@@ -3606,8 +3878,8 @@
#: ../gio/gthemedicon.c:518
#, c-format
-msgid "Can't handle version %d of GThemedIcon encoding"
-msgstr "无法处理 GThemedIcon 编码的版本 %d"
+msgid "Can’t handle version %d of GThemedIcon encoding"
+msgstr "无法处理版本为 %d 的 GThemedIcon 编码"
#: ../gio/gthreadedresolver.c:118
msgid "No valid addresses were found"
@@ -3615,23 +3887,23 @@
#: ../gio/gthreadedresolver.c:213
#, c-format
-msgid "Error reverse-resolving '%s': %s"
+msgid "Error reverse-resolving “%s”: %s"
msgstr "反向解析“%s”时出错：%s"
-#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
-#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
+#: ../gio/gthreadedresolver.c:549 ../gio/gthreadedresolver.c:628
+#: ../gio/gthreadedresolver.c:726 ../gio/gthreadedresolver.c:776
#, c-format
-msgid "No DNS record of the requested type for '%s'"
+msgid "No DNS record of the requested type for “%s”"
msgstr "没有“%s”所请求类型的 DNS 记录"
-#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
+#: ../gio/gthreadedresolver.c:554 ../gio/gthreadedresolver.c:731
#, c-format
-msgid "Temporarily unable to resolve '%s'"
+msgid "Temporarily unable to resolve “%s”"
msgstr "暂时无法解析“%s”"
-#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
+#: ../gio/gthreadedresolver.c:559 ../gio/gthreadedresolver.c:736
#, c-format
-msgid "Error resolving '%s'"
+msgid "Error resolving “%s”"
msgstr "解析“%s”时出错"
#: ../gio/gtlscertificate.c:250
@@ -3660,23 +3932,25 @@
"is locked out."
msgstr "这是您的访问被锁定前最后一次机会输入正确的密码。"
-#: ../gio/gtlspassword.c:113
-msgid ""
-"Several password entered have been incorrect, and your access will be locked "
-"out after further failures."
-msgstr "密码多次输入错误，您的访问将在下一次错误输入后锁定。"
-
+#. Translators: This is not the 'This is the last chance' string. It is
+#. * displayed when more than one attempt is allowed.
#: ../gio/gtlspassword.c:115
+msgid ""
+"Several passwords entered have been incorrect, and your access will be "
+"locked out after further failures."
+msgstr "密码多次输入错误，您的访问将在数次错误输入后锁定。"
+
+#: ../gio/gtlspassword.c:117
msgid "The password entered is incorrect."
msgstr "输入的密码不正确。"
-#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:561
+#: ../gio/gunixconnection.c:166 ../gio/gunixconnection.c:563
#, c-format
msgid "Expecting 1 control message, got %d"
msgid_plural "Expecting 1 control message, got %d"
msgstr[0] "应为 1 个控件消息，却得到 %d 个"
-#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:573
+#: ../gio/gunixconnection.c:182 ../gio/gunixconnection.c:575
msgid "Unexpected type of ancillary data"
msgstr "非预期的辅助数据类型"
@@ -3694,64 +3968,64 @@
msgid "Error sending credentials: "
msgstr "发送证书出错："
-#: ../gio/gunixconnection.c:503
+#: ../gio/gunixconnection.c:504
#, c-format
msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
msgstr "检查套接字是否启用 SO_PASSCRED 出错：%s"
-#: ../gio/gunixconnection.c:518
+#: ../gio/gunixconnection.c:520
#, c-format
msgid "Error enabling SO_PASSCRED: %s"
msgstr "启用 SO_PASSCRED 出错：%s"
-#: ../gio/gunixconnection.c:547
+#: ../gio/gunixconnection.c:549
msgid ""
"Expecting to read a single byte for receiving credentials but read zero bytes"
msgstr "期望为接收证书读到单个字节但是只读到了 0 字节"
-#: ../gio/gunixconnection.c:587
+#: ../gio/gunixconnection.c:589
#, c-format
msgid "Not expecting control message, but got %d"
msgstr "未期望控制信息，却得到 %d 个"
-#: ../gio/gunixconnection.c:611
+#: ../gio/gunixconnection.c:614
#, c-format
msgid "Error while disabling SO_PASSCRED: %s"
msgstr "禁用 SO_PASSCRED 时出错：%s"
-#: ../gio/gunixinputstream.c:369 ../gio/gunixinputstream.c:390
+#: ../gio/gunixinputstream.c:372 ../gio/gunixinputstream.c:393
#, c-format
msgid "Error reading from file descriptor: %s"
msgstr "从文件描述符读取出错：%s"
-#: ../gio/gunixinputstream.c:423 ../gio/gunixoutputstream.c:409
+#: ../gio/gunixinputstream.c:426 ../gio/gunixoutputstream.c:411
#: ../gio/gwin32inputstream.c:217 ../gio/gwin32outputstream.c:204
#, c-format
msgid "Error closing file descriptor: %s"
msgstr "关闭文件描述符出错：%s"
-#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382
+#: ../gio/gunixmounts.c:2539 ../gio/gunixmounts.c:2592
msgid "Filesystem root"
msgstr "文件系统根目录"
-#: ../gio/gunixoutputstream.c:355 ../gio/gunixoutputstream.c:376
+#: ../gio/gunixoutputstream.c:358 ../gio/gunixoutputstream.c:378
#, c-format
msgid "Error writing to file descriptor: %s"
msgstr "写入文件描述符出错：%s"
-#: ../gio/gunixsocketaddress.c:239
+#: ../gio/gunixsocketaddress.c:241
msgid "Abstract UNIX domain socket addresses not supported on this system"
msgstr "本系统不支持抽象 Unix 域套接字地址"
#: ../gio/gvolume.c:437
-msgid "volume doesn't implement eject"
+msgid "volume doesn’t implement eject"
msgstr "卷未实现弹出"
#. Translators: This is an error
#. * message for volume objects that
#. * don't implement any of eject or eject_with_operation.
#: ../gio/gvolume.c:514
-msgid "volume doesn't implement eject or eject_with_operation"
+msgid "volume doesn’t implement eject or eject_with_operation"
msgstr "卷未实现弹出或 eject_with_operation"
#: ../gio/gwin32inputstream.c:185
@@ -3811,549 +4085,545 @@
msgid "Wrong args\n"
msgstr "参数错误\n"
-#: ../glib/gbookmarkfile.c:755
+#: ../glib/gbookmarkfile.c:754
#, c-format
-msgid "Unexpected attribute '%s' for element '%s'"
+msgid "Unexpected attribute “%s” for element “%s”"
msgstr "元素“%2$s”的意外属性“%1$s”"
-#: ../glib/gbookmarkfile.c:766 ../glib/gbookmarkfile.c:837
-#: ../glib/gbookmarkfile.c:847 ../glib/gbookmarkfile.c:954
+#: ../glib/gbookmarkfile.c:765 ../glib/gbookmarkfile.c:836
+#: ../glib/gbookmarkfile.c:846 ../glib/gbookmarkfile.c:953
#, c-format
-msgid "Attribute '%s' of element '%s' not found"
+msgid "Attribute “%s” of element “%s” not found"
msgstr "元素“%2$s”的属性“%1$s”未找到"
-#: ../glib/gbookmarkfile.c:1124 ../glib/gbookmarkfile.c:1189
-#: ../glib/gbookmarkfile.c:1253 ../glib/gbookmarkfile.c:1263
+#: ../glib/gbookmarkfile.c:1123 ../glib/gbookmarkfile.c:1188
+#: ../glib/gbookmarkfile.c:1252 ../glib/gbookmarkfile.c:1262
#, c-format
-msgid "Unexpected tag '%s', tag '%s' expected"
+msgid "Unexpected tag “%s”, tag “%s” expected"
msgstr "意外标签“%s”，需要标签“%s”"
-#: ../glib/gbookmarkfile.c:1149 ../glib/gbookmarkfile.c:1163
-#: ../glib/gbookmarkfile.c:1231
+#: ../glib/gbookmarkfile.c:1148 ../glib/gbookmarkfile.c:1162
+#: ../glib/gbookmarkfile.c:1230
#, c-format
-msgid "Unexpected tag '%s' inside '%s'"
+msgid "Unexpected tag “%s” inside “%s”"
msgstr "“%2$s”中的意外标签“%1$s”"
-#: ../glib/gbookmarkfile.c:1757
+#: ../glib/gbookmarkfile.c:1756
msgid "No valid bookmark file found in data dirs"
msgstr "数据目录中没有找到有效的书签文件"
-#: ../glib/gbookmarkfile.c:1958
+#: ../glib/gbookmarkfile.c:1957
#, c-format
-msgid "A bookmark for URI '%s' already exists"
+msgid "A bookmark for URI “%s” already exists"
msgstr "URI“%s”的书签已经存在"
-#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
-#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
-#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
-#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
-#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
-#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101
-#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345
-#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
-#: ../glib/gbookmarkfile.c:3639
+#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
+#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
+#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
+#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
+#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
+#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
+#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
+#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
+#: ../glib/gbookmarkfile.c:3638
#, c-format
-msgid "No bookmark found for URI '%s'"
+msgid "No bookmark found for URI “%s”"
msgstr "未找到 URI“%s”的书签"
-#: ../glib/gbookmarkfile.c:2336
+#: ../glib/gbookmarkfile.c:2335
#, c-format
-msgid "No MIME type defined in the bookmark for URI '%s'"
+msgid "No MIME type defined in the bookmark for URI “%s”"
msgstr "URI“%s”的书签未定义 MIME 类型"
-#: ../glib/gbookmarkfile.c:2421
+#: ../glib/gbookmarkfile.c:2420
#, c-format
-msgid "No private flag has been defined in bookmark for URI '%s'"
+msgid "No private flag has been defined in bookmark for URI “%s”"
msgstr "URI“%s”的书签未定义私有标志"
-#: ../glib/gbookmarkfile.c:2800
+#: ../glib/gbookmarkfile.c:2799
#, c-format
-msgid "No groups set in bookmark for URI '%s'"
+msgid "No groups set in bookmark for URI “%s”"
msgstr "URI“%s”的书签未设定组"
-#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
+#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
#, c-format
-msgid "No application with name '%s' registered a bookmark for '%s'"
+msgid "No application with name “%s” registered a bookmark for “%s”"
msgstr "没有名为“%s”的应用程序为“%s”注册书签"
-#: ../glib/gbookmarkfile.c:3378
+#: ../glib/gbookmarkfile.c:3377
#, c-format
-msgid "Failed to expand exec line '%s' with URI '%s'"
+msgid "Failed to expand exec line “%s” with URI “%s”"
msgstr "用 URI“%2$s”展开 exec 行“%1$s”失败"
-#: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063
-#: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304
+#: ../glib/gconvert.c:477 ../glib/gutf8.c:862 ../glib/gutf8.c:1074
+#: ../glib/gutf8.c:1211 ../glib/gutf8.c:1315
msgid "Partial character sequence at end of input"
msgstr "输入末尾出现未尽字符序列"
#: ../glib/gconvert.c:742
#, c-format
-msgid "Cannot convert fallback '%s' to codeset '%s'"
+msgid "Cannot convert fallback “%s” to codeset “%s”"
msgstr "无法转换后备字符集“%s”到字符集“%s”"
-#: ../glib/gconvert.c:1567
+#: ../glib/gconvert.c:1513
#, c-format
-msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
+msgid "The URI “%s” is not an absolute URI using the “file” scheme"
msgstr "URI“%s”不是使用“file”方案的绝对 URI"
-#: ../glib/gconvert.c:1577
+#: ../glib/gconvert.c:1523
#, c-format
-msgid "The local file URI '%s' may not include a '#'"
+msgid "The local file URI “%s” may not include a “#”"
msgstr "本地文件 URI“%s”不能包含“#”"
-#: ../glib/gconvert.c:1594
+#: ../glib/gconvert.c:1540
#, c-format
-msgid "The URI '%s' is invalid"
+msgid "The URI “%s” is invalid"
msgstr "URI“%s”无效"
-#: ../glib/gconvert.c:1606
+#: ../glib/gconvert.c:1552
#, c-format
-msgid "The hostname of the URI '%s' is invalid"
+msgid "The hostname of the URI “%s” is invalid"
msgstr "URI“%s”中的主机名无效"
-#: ../glib/gconvert.c:1622
+#: ../glib/gconvert.c:1568
#, c-format
-msgid "The URI '%s' contains invalidly escaped characters"
+msgid "The URI “%s” contains invalidly escaped characters"
msgstr "URI“%s”中包含无效的转义字符"
-#: ../glib/gconvert.c:1717
+#: ../glib/gconvert.c:1640
#, c-format
-msgid "The pathname '%s' is not an absolute path"
+msgid "The pathname “%s” is not an absolute path"
msgstr "路径名“%s”不是绝对路径"
-#: ../glib/gconvert.c:1727
-msgid "Invalid hostname"
-msgstr "无效的主机名"
-
-#. Translators: 'before midday' indicator
-#: ../glib/gdatetime.c:201
-msgctxt "GDateTime"
-msgid "AM"
-msgstr "上午"
-
-#. Translators: 'after midday' indicator
-#: ../glib/gdatetime.c:203
-msgctxt "GDateTime"
-msgid "PM"
-msgstr "下午"
-
#. Translators: this is the preferred format for expressing the date and the time
-#: ../glib/gdatetime.c:206
+#: ../glib/gdatetime.c:203
msgctxt "GDateTime"
msgid "%a %b %e %H:%M:%S %Y"
msgstr "%Y年%m月%d日 %A %H时%M分%S秒"
#. Translators: this is the preferred format for expressing the date
-#: ../glib/gdatetime.c:209
+#: ../glib/gdatetime.c:206
msgctxt "GDateTime"
msgid "%m/%d/%y"
msgstr "%m/%d/%y"
#. Translators: this is the preferred format for expressing the time
-#: ../glib/gdatetime.c:212
+#: ../glib/gdatetime.c:209
msgctxt "GDateTime"
msgid "%H:%M:%S"
msgstr "%H:%M:%S"
#. Translators: this is the preferred format for expressing 12 hour time
-#: ../glib/gdatetime.c:215
+#: ../glib/gdatetime.c:212
msgctxt "GDateTime"
msgid "%I:%M:%S %p"
msgstr "%p %I时%M分%S秒"
-#: ../glib/gdatetime.c:228
+#: ../glib/gdatetime.c:225
msgctxt "full month name"
msgid "January"
msgstr "一月"
-#: ../glib/gdatetime.c:230
+#: ../glib/gdatetime.c:227
msgctxt "full month name"
msgid "February"
msgstr "二月"
-#: ../glib/gdatetime.c:232
+#: ../glib/gdatetime.c:229
msgctxt "full month name"
msgid "March"
msgstr "三月"
-#: ../glib/gdatetime.c:234
+#: ../glib/gdatetime.c:231
msgctxt "full month name"
msgid "April"
msgstr "四月"
-#: ../glib/gdatetime.c:236
+#: ../glib/gdatetime.c:233
msgctxt "full month name"
msgid "May"
msgstr "五月"
-#: ../glib/gdatetime.c:238
+#: ../glib/gdatetime.c:235
msgctxt "full month name"
msgid "June"
msgstr "六月"
-#: ../glib/gdatetime.c:240
+#: ../glib/gdatetime.c:237
msgctxt "full month name"
msgid "July"
msgstr "七月"
-#: ../glib/gdatetime.c:242
+#: ../glib/gdatetime.c:239
msgctxt "full month name"
msgid "August"
msgstr "八月"
-#: ../glib/gdatetime.c:244
+#: ../glib/gdatetime.c:241
msgctxt "full month name"
msgid "September"
msgstr "九月"
-#: ../glib/gdatetime.c:246
+#: ../glib/gdatetime.c:243
msgctxt "full month name"
msgid "October"
msgstr "十月"
-#: ../glib/gdatetime.c:248
+#: ../glib/gdatetime.c:245
msgctxt "full month name"
msgid "November"
msgstr "十一月"
-#: ../glib/gdatetime.c:250
+#: ../glib/gdatetime.c:247
msgctxt "full month name"
msgid "December"
msgstr "十二月"
-#: ../glib/gdatetime.c:265
+#: ../glib/gdatetime.c:262
msgctxt "abbreviated month name"
msgid "Jan"
msgstr "01月"
-#: ../glib/gdatetime.c:267
+#: ../glib/gdatetime.c:264
msgctxt "abbreviated month name"
msgid "Feb"
msgstr "02月"
-#: ../glib/gdatetime.c:269
+#: ../glib/gdatetime.c:266
msgctxt "abbreviated month name"
msgid "Mar"
msgstr "03月"
-#: ../glib/gdatetime.c:271
+#: ../glib/gdatetime.c:268
msgctxt "abbreviated month name"
msgid "Apr"
msgstr "04月"
-#: ../glib/gdatetime.c:273
+#: ../glib/gdatetime.c:270
msgctxt "abbreviated month name"
msgid "May"
msgstr "05月"
-#: ../glib/gdatetime.c:275
+#: ../glib/gdatetime.c:272
msgctxt "abbreviated month name"
msgid "Jun"
msgstr "06月"
-#: ../glib/gdatetime.c:277
+#: ../glib/gdatetime.c:274
msgctxt "abbreviated month name"
msgid "Jul"
msgstr "07月"
-#: ../glib/gdatetime.c:279
+#: ../glib/gdatetime.c:276
msgctxt "abbreviated month name"
msgid "Aug"
msgstr "08月"
-#: ../glib/gdatetime.c:281
+#: ../glib/gdatetime.c:278
msgctxt "abbreviated month name"
msgid "Sep"
msgstr "09月"
-#: ../glib/gdatetime.c:283
+#: ../glib/gdatetime.c:280
msgctxt "abbreviated month name"
msgid "Oct"
msgstr "10月"
-#: ../glib/gdatetime.c:285
+#: ../glib/gdatetime.c:282
msgctxt "abbreviated month name"
msgid "Nov"
msgstr "11月"
-#: ../glib/gdatetime.c:287
+#: ../glib/gdatetime.c:284
msgctxt "abbreviated month name"
msgid "Dec"
msgstr "12月"
-#: ../glib/gdatetime.c:302
+#: ../glib/gdatetime.c:299
msgctxt "full weekday name"
msgid "Monday"
msgstr "星期一"
-#: ../glib/gdatetime.c:304
+#: ../glib/gdatetime.c:301
msgctxt "full weekday name"
msgid "Tuesday"
msgstr "星期二"
-#: ../glib/gdatetime.c:306
+#: ../glib/gdatetime.c:303
msgctxt "full weekday name"
msgid "Wednesday"
msgstr "星期三"
-#: ../glib/gdatetime.c:308
+#: ../glib/gdatetime.c:305
msgctxt "full weekday name"
msgid "Thursday"
msgstr "星期四"
-#: ../glib/gdatetime.c:310
+#: ../glib/gdatetime.c:307
msgctxt "full weekday name"
msgid "Friday"
msgstr "星期五"
-#: ../glib/gdatetime.c:312
+#: ../glib/gdatetime.c:309
msgctxt "full weekday name"
msgid "Saturday"
msgstr "星期六"
-#: ../glib/gdatetime.c:314
+#: ../glib/gdatetime.c:311
msgctxt "full weekday name"
msgid "Sunday"
msgstr "星期日"
-#: ../glib/gdatetime.c:329
+#: ../glib/gdatetime.c:326
msgctxt "abbreviated weekday name"
msgid "Mon"
msgstr "一"
-#: ../glib/gdatetime.c:331
+#: ../glib/gdatetime.c:328
msgctxt "abbreviated weekday name"
msgid "Tue"
msgstr "二"
-#: ../glib/gdatetime.c:333
+#: ../glib/gdatetime.c:330
msgctxt "abbreviated weekday name"
msgid "Wed"
msgstr "三"
-#: ../glib/gdatetime.c:335
+#: ../glib/gdatetime.c:332
msgctxt "abbreviated weekday name"
msgid "Thu"
msgstr "四"
-#: ../glib/gdatetime.c:337
+#: ../glib/gdatetime.c:334
msgctxt "abbreviated weekday name"
msgid "Fri"
msgstr "五"
-#: ../glib/gdatetime.c:339
+#: ../glib/gdatetime.c:336
msgctxt "abbreviated weekday name"
msgid "Sat"
msgstr "六"
-#: ../glib/gdatetime.c:341
+#: ../glib/gdatetime.c:338
msgctxt "abbreviated weekday name"
msgid "Sun"
msgstr "日"
+#. Translators: 'before midday' indicator
+#: ../glib/gdatetime.c:355
+msgctxt "GDateTime"
+msgid "AM"
+msgstr "上午"
+
+#. Translators: 'after midday' indicator
+#: ../glib/gdatetime.c:358
+msgctxt "GDateTime"
+msgid "PM"
+msgstr "下午"
+
#: ../glib/gdir.c:155
#, c-format
-msgid "Error opening directory '%s': %s"
-msgstr "打开目录“%s”时发生错误：%s"
+msgid "Error opening directory “%s”: %s"
+msgstr "打开目录“%s”出错：%s"
-#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
+#: ../glib/gfileutils.c:715 ../glib/gfileutils.c:807
#, c-format
-msgid "Could not allocate %lu byte to read file \"%s\""
-msgid_plural "Could not allocate %lu bytes to read file \"%s\""
+msgid "Could not allocate %lu byte to read file “%s”"
+msgid_plural "Could not allocate %lu bytes to read file “%s”"
msgstr[0] "无法分配 %lu 字节以读取文件“%s”"
-#: ../glib/gfileutils.c:718
+#: ../glib/gfileutils.c:732
#, c-format
-msgid "Error reading file '%s': %s"
+msgid "Error reading file “%s”: %s"
msgstr "读取文件“%s”出错：%s"
-#: ../glib/gfileutils.c:754
+#: ../glib/gfileutils.c:768
#, c-format
-msgid "File \"%s\" is too large"
+msgid "File “%s” is too large"
msgstr "文件“%s”过大"
-#: ../glib/gfileutils.c:818
+#: ../glib/gfileutils.c:832
#, c-format
-msgid "Failed to read from file '%s': %s"
+msgid "Failed to read from file “%s”: %s"
msgstr "读取文件“%s”失败：%s"
-#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
+#: ../glib/gfileutils.c:880 ../glib/gfileutils.c:952
#, c-format
-msgid "Failed to open file '%s': %s"
+msgid "Failed to open file “%s”: %s"
msgstr "打开文件“%s”失败：%s"
-#: ../glib/gfileutils.c:878
+#: ../glib/gfileutils.c:892
#, c-format
-msgid "Failed to get attributes of file '%s': fstat() failed: %s"
+msgid "Failed to get attributes of file “%s”: fstat() failed: %s"
msgstr "获得文件“%s”的属性失败：fstat() 失败：%s"
-#: ../glib/gfileutils.c:908
+#: ../glib/gfileutils.c:922
#, c-format
-msgid "Failed to open file '%s': fdopen() failed: %s"
+msgid "Failed to open file “%s”: fdopen() failed: %s"
msgstr "打开文件“%s”失败：fdopen() 失败：%s"
-#: ../glib/gfileutils.c:1007
+#: ../glib/gfileutils.c:1021
#, c-format
-msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
+msgid "Failed to rename file “%s” to “%s”: g_rename() failed: %s"
msgstr "将文件“%s”重命名为“%s”失败：g_rename() 失败：%s"
-#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
+#: ../glib/gfileutils.c:1056 ../glib/gfileutils.c:1563
#, c-format
-msgid "Failed to create file '%s': %s"
+msgid "Failed to create file “%s”: %s"
msgstr "创建文件“%s”失败：%s"
-#: ../glib/gfileutils.c:1069
+#: ../glib/gfileutils.c:1083
#, c-format
-msgid "Failed to write file '%s': write() failed: %s"
+msgid "Failed to write file “%s”: write() failed: %s"
msgstr "写入文件“%s”失败：write() 失败：%s"
-#: ../glib/gfileutils.c:1112
+#: ../glib/gfileutils.c:1126
#, c-format
-msgid "Failed to write file '%s': fsync() failed: %s"
+msgid "Failed to write file “%s”: fsync() failed: %s"
msgstr "写入文件“%s”失败：fsync() 失败：%s"
-#: ../glib/gfileutils.c:1236
+#: ../glib/gfileutils.c:1250
#, c-format
-msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
+msgid "Existing file “%s” could not be removed: g_unlink() failed: %s"
msgstr "无法删除已有文件“%s”：g_unlink() 失败：%s"
-#: ../glib/gfileutils.c:1507
+#: ../glib/gfileutils.c:1529
#, c-format
-msgid "Template '%s' invalid, should not contain a '%s'"
+msgid "Template “%s” invalid, should not contain a “%s”"
msgstr "模板“%s”无效，不应该包含“%s”"
-#: ../glib/gfileutils.c:1520
+#: ../glib/gfileutils.c:1542
#, c-format
-msgid "Template '%s' doesn't contain XXXXXX"
+msgid "Template “%s” doesn’t contain XXXXXX"
msgstr "模板“%s”不包含 XXXXXX"
-#: ../glib/gfileutils.c:2045
+#: ../glib/gfileutils.c:2074
#, c-format
-msgid "Failed to read the symbolic link '%s': %s"
+msgid "Failed to read the symbolic link “%s”: %s"
msgstr "读取符号链接“%s”失败：%s"
-#: ../glib/giochannel.c:1388
+#: ../glib/giochannel.c:1389
#, c-format
-msgid "Could not open converter from '%s' to '%s': %s"
+msgid "Could not open converter from “%s” to “%s”: %s"
msgstr "无法打开从“%s”到“%s”的转换器：%s"
-#: ../glib/giochannel.c:1733
-msgid "Can't do a raw read in g_io_channel_read_line_string"
+#: ../glib/giochannel.c:1734
+msgid "Can’t do a raw read in g_io_channel_read_line_string"
msgstr "g_io_channel_read_line_string 函数无法进行原始读取"
-#: ../glib/giochannel.c:1780 ../glib/giochannel.c:2038
-#: ../glib/giochannel.c:2125
+#: ../glib/giochannel.c:1781 ../glib/giochannel.c:2039
+#: ../glib/giochannel.c:2126
msgid "Leftover unconverted data in read buffer"
msgstr "在读缓冲里留有未转换数据"
-#: ../glib/giochannel.c:1861 ../glib/giochannel.c:1938
+#: ../glib/giochannel.c:1862 ../glib/giochannel.c:1939
msgid "Channel terminates in a partial character"
msgstr "通道终止于未尽字符"
-#: ../glib/giochannel.c:1924
-msgid "Can't do a raw read in g_io_channel_read_to_end"
+#: ../glib/giochannel.c:1925
+msgid "Can’t do a raw read in g_io_channel_read_to_end"
msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
-#: ../glib/gkeyfile.c:737
+#: ../glib/gkeyfile.c:788
msgid "Valid key file could not be found in search dirs"
msgstr "在搜索目录中无法找到有效的键文件"
-#: ../glib/gkeyfile.c:773
+#: ../glib/gkeyfile.c:825
msgid "Not a regular file"
msgstr "不是普通文件"
-#: ../glib/gkeyfile.c:1204
+#: ../glib/gkeyfile.c:1270
#, c-format
msgid ""
-"Key file contains line '%s' which is not a key-value pair, group, or comment"
+"Key file contains line “%s” which is not a key-value pair, group, or comment"
msgstr "键文件包含不是键-值对、组或注释的行“%s”"
-#: ../glib/gkeyfile.c:1261
+#: ../glib/gkeyfile.c:1327
#, c-format
msgid "Invalid group name: %s"
msgstr "无效的组名：%s"
-#: ../glib/gkeyfile.c:1283
+#: ../glib/gkeyfile.c:1349
msgid "Key file does not start with a group"
msgstr "键文件不以组开始"
-#: ../glib/gkeyfile.c:1309
+#: ../glib/gkeyfile.c:1375
#, c-format
msgid "Invalid key name: %s"
msgstr "无效的键名：%s"
-#: ../glib/gkeyfile.c:1336
+#: ../glib/gkeyfile.c:1402
#, c-format
-msgid "Key file contains unsupported encoding '%s'"
+msgid "Key file contains unsupported encoding “%s”"
msgstr "键文件包含不支持的编码“%s”"
-#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
-#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
-#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
+#: ../glib/gkeyfile.c:1645 ../glib/gkeyfile.c:1818 ../glib/gkeyfile.c:3198
+#: ../glib/gkeyfile.c:3261 ../glib/gkeyfile.c:3391 ../glib/gkeyfile.c:3521
+#: ../glib/gkeyfile.c:3665 ../glib/gkeyfile.c:3894 ../glib/gkeyfile.c:3961
#, c-format
-msgid "Key file does not have group '%s'"
+msgid "Key file does not have group “%s”"
msgstr "键文件没有组“%s”"
-#: ../glib/gkeyfile.c:1707
+#: ../glib/gkeyfile.c:1773
#, c-format
-msgid "Key file does not have key '%s' in group '%s'"
+msgid "Key file does not have key “%s” in group “%s”"
msgstr "键文件在组“%2$s”中没有键“%1$s”"
-#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
+#: ../glib/gkeyfile.c:1935 ../glib/gkeyfile.c:2051
#, c-format
-msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
+msgid "Key file contains key “%s” with value “%s” which is not UTF-8"
msgstr "键文件包含键“%s”，其值“%s”不是 UTF-8"
-#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
+#: ../glib/gkeyfile.c:1955 ../glib/gkeyfile.c:2071 ../glib/gkeyfile.c:2440
#, c-format
msgid ""
-"Key file contains key '%s' which has a value that cannot be interpreted."
-msgstr "键文件包含键“%s”，其值无法解释。"
+"Key file contains key “%s” which has a value that cannot be interpreted."
+msgstr "键文件包含键“%s”，其值无法解析。"
-#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
+#: ../glib/gkeyfile.c:2658 ../glib/gkeyfile.c:3027
#, c-format
msgid ""
-"Key file contains key '%s' in group '%s' which has a value that cannot be "
+"Key file contains key “%s” in group “%s” which has a value that cannot be "
"interpreted."
msgstr "键文件包含组“%2$s”中的键“%1$s”，其值无法解释。"
-#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
+#: ../glib/gkeyfile.c:2736 ../glib/gkeyfile.c:2813
#, c-format
-msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
+msgid "Key “%s” in group “%s” has value “%s” where %s was expected"
msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”，应为 %4$s"
-#: ../glib/gkeyfile.c:4133
+#: ../glib/gkeyfile.c:4201
msgid "Key file contains escape character at end of line"
msgstr "键文件在行尾含有转义字符"
-#: ../glib/gkeyfile.c:4155
+#: ../glib/gkeyfile.c:4223
#, c-format
-msgid "Key file contains invalid escape sequence '%s'"
+msgid "Key file contains invalid escape sequence “%s”"
msgstr "键文件中包含无效的转义序列“%s”"
-#: ../glib/gkeyfile.c:4297
+#: ../glib/gkeyfile.c:4367
#, c-format
-msgid "Value '%s' cannot be interpreted as a number."
+msgid "Value “%s” cannot be interpreted as a number."
msgstr "无法将值“%s”解释为数值。"
-#: ../glib/gkeyfile.c:4311
+#: ../glib/gkeyfile.c:4381
#, c-format
-msgid "Integer value '%s' out of range"
+msgid "Integer value “%s” out of range"
msgstr "整数值“%s”超出范围"
-#: ../glib/gkeyfile.c:4344
+#: ../glib/gkeyfile.c:4414
#, c-format
-msgid "Value '%s' cannot be interpreted as a float number."
+msgid "Value “%s” cannot be interpreted as a float number."
msgstr "无法将值“%s”解释为浮点数。"
-#: ../glib/gkeyfile.c:4383
+#: ../glib/gkeyfile.c:4453
#, c-format
-msgid "Value '%s' cannot be interpreted as a boolean."
+msgid "Value “%s” cannot be interpreted as a boolean."
msgstr "无法将值“%s”解释为布尔值。"
#: ../glib/gmappedfile.c:129
#, c-format
-msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
+msgid "Failed to get attributes of file “%s%s%s%s”: fstat() failed: %s"
msgstr "获取文件“%s%s%s%s”的属性失败 : fstat() 失败：%s"
#: ../glib/gmappedfile.c:195
@@ -4363,35 +4633,35 @@
#: ../glib/gmappedfile.c:262
#, c-format
-msgid "Failed to open file '%s': open() failed: %s"
+msgid "Failed to open file “%s”: open() failed: %s"
msgstr "打开文件“%s”失败：open() 失败：%s"
-#: ../glib/gmarkup.c:398 ../glib/gmarkup.c:440
+#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
#, c-format
msgid "Error on line %d char %d: "
msgstr "第 %d 行第 %d 个字符出错："
-#: ../glib/gmarkup.c:462 ../glib/gmarkup.c:545
+#: ../glib/gmarkup.c:461 ../glib/gmarkup.c:544
#, c-format
msgid "Invalid UTF-8 encoded text in name - not valid '%s'"
msgstr "无效的 UTF-8 编码的文本名称 -“%s”无效"
-#: ../glib/gmarkup.c:473
+#: ../glib/gmarkup.c:472
#, c-format
msgid "'%s' is not a valid name"
msgstr "“%s”不是有效的名称"
-#: ../glib/gmarkup.c:489
+#: ../glib/gmarkup.c:488
#, c-format
msgid "'%s' is not a valid name: '%c'"
msgstr "“%s”不是有效的名称：“%c”"
-#: ../glib/gmarkup.c:599
+#: ../glib/gmarkup.c:598
#, c-format
msgid "Error on line %d: %s"
msgstr "第 %d 行出错：%s"
-#: ../glib/gmarkup.c:676
+#: ../glib/gmarkup.c:675
#, c-format
msgid ""
"Failed to parse '%-.*s', which should have been a digit inside a character "
@@ -4399,7 +4669,7 @@
msgstr ""
"解析“%-.*s”失败。它应该是字符引用中的数字(如 ê) - 可能该数字太大了"
-#: ../glib/gmarkup.c:688
+#: ../glib/gmarkup.c:687
msgid ""
"Character reference did not end with a semicolon; most likely you used an "
"ampersand character without intending to start an entity - escape ampersand "
@@ -4408,22 +4678,22 @@
"字符引用没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变"
"为 &"
-#: ../glib/gmarkup.c:714
+#: ../glib/gmarkup.c:713
#, c-format
msgid "Character reference '%-.*s' does not encode a permitted character"
msgstr "字符引用“%-.*s”不是编码一个被允许的字符"
-#: ../glib/gmarkup.c:752
+#: ../glib/gmarkup.c:751
msgid ""
"Empty entity '&;' seen; valid entities are: & " < > '"
msgstr "发现空的实体“&;”。有效的实体为：& " < > '"
-#: ../glib/gmarkup.c:760
+#: ../glib/gmarkup.c:759
#, c-format
msgid "Entity name '%-.*s' is not known"
msgstr "未知的实体名“%-.*s”"
-#: ../glib/gmarkup.c:765
+#: ../glib/gmarkup.c:764
msgid ""
"Entity did not end with a semicolon; most likely you used an ampersand "
"character without intending to start an entity - escape ampersand as &"
@@ -4431,31 +4701,31 @@
"实体没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变为 "
"&"
-#: ../glib/gmarkup.c:1171
+#: ../glib/gmarkup.c:1170
msgid "Document must begin with an element (e.g. <book>)"
msgstr "文档必须以一个元素开始(例如 <book>)"
-#: ../glib/gmarkup.c:1211
+#: ../glib/gmarkup.c:1210
#, c-format
msgid ""
"'%s' is not a valid character following a '<' character; it may not begin an "
"element name"
msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
-#: ../glib/gmarkup.c:1253
+#: ../glib/gmarkup.c:1252
#, c-format
msgid ""
"Odd character '%s', expected a '>' character to end the empty-element tag "
"'%s'"
msgstr "字符“%s”无效，应该以字符“>”来结束空元素标记“%s”"
-#: ../glib/gmarkup.c:1334
+#: ../glib/gmarkup.c:1333
#, c-format
msgid ""
"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
-#: ../glib/gmarkup.c:1375
+#: ../glib/gmarkup.c:1374
#, c-format
msgid ""
"Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -4465,92 +4735,92 @@
"字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能"
"您在属性名中使用了无效字符"
-#: ../glib/gmarkup.c:1419
+#: ../glib/gmarkup.c:1418
#, c-format
msgid ""
"Odd character '%s', expected an open quote mark after the equals sign when "
"giving value for attribute '%s' of element '%s'"
msgstr "字符“%s”无效，在给属性“%s”(元素“%s”)赋值时，在等号后应该是引号"
-#: ../glib/gmarkup.c:1552
+#: ../glib/gmarkup.c:1551
#, c-format
msgid ""
"'%s' is not a valid character following the characters '</'; '%s' may not "
"begin an element name"
msgstr "“%s”出现在字符“</”后无效；“%s”不能作为元素名的开头"
-#: ../glib/gmarkup.c:1588
+#: ../glib/gmarkup.c:1587
#, c-format
msgid ""
"'%s' is not a valid character following the close element name '%s'; the "
"allowed character is '>'"
msgstr "“%s”出现在结束的元素名“%s”后无效；允许的字符是“>”"
-#: ../glib/gmarkup.c:1599
+#: ../glib/gmarkup.c:1598
#, c-format
msgid "Element '%s' was closed, no element is currently open"
msgstr "元素“%s”已经结束，没有未结束的元素"
-#: ../glib/gmarkup.c:1608
+#: ../glib/gmarkup.c:1607
#, c-format
msgid "Element '%s' was closed, but the currently open element is '%s'"
msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
-#: ../glib/gmarkup.c:1761
+#: ../glib/gmarkup.c:1760
msgid "Document was empty or contained only whitespace"
msgstr "文档为空或仅含空白字符"
-#: ../glib/gmarkup.c:1775
+#: ../glib/gmarkup.c:1774
msgid "Document ended unexpectedly just after an open angle bracket '<'"
msgstr "文档在一个打开的尖括号“<”后意外结束"
-#: ../glib/gmarkup.c:1783 ../glib/gmarkup.c:1828
+#: ../glib/gmarkup.c:1782 ../glib/gmarkup.c:1827
#, c-format
msgid ""
"Document ended unexpectedly with elements still open - '%s' was the last "
"element opened"
msgstr "文档在还存在未结束元素时意外结束 - 最后的未结束元素是“%s”"
-#: ../glib/gmarkup.c:1791
+#: ../glib/gmarkup.c:1790
#, c-format
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
"the tag <%s/>"
msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
-#: ../glib/gmarkup.c:1797
+#: ../glib/gmarkup.c:1796
msgid "Document ended unexpectedly inside an element name"
msgstr "文档在元素名中意外结束"
-#: ../glib/gmarkup.c:1803
+#: ../glib/gmarkup.c:1802
msgid "Document ended unexpectedly inside an attribute name"
msgstr "文档在属性名中意外结束"
-#: ../glib/gmarkup.c:1808
+#: ../glib/gmarkup.c:1807
msgid "Document ended unexpectedly inside an element-opening tag."
msgstr "文档在元素起始标记中意外结束"
-#: ../glib/gmarkup.c:1814
+#: ../glib/gmarkup.c:1813
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
msgstr "文档在跟在属性名后的等号后意外结束；没有属性值"
-#: ../glib/gmarkup.c:1821
+#: ../glib/gmarkup.c:1820
msgid "Document ended unexpectedly while inside an attribute value"
msgstr "文档在属性值中意外结束"
-#: ../glib/gmarkup.c:1837
+#: ../glib/gmarkup.c:1836
#, c-format
msgid "Document ended unexpectedly inside the close tag for element '%s'"
msgstr "文档在元素“%s”结束标记中意外结束"
-#: ../glib/gmarkup.c:1843
+#: ../glib/gmarkup.c:1842
msgid "Document ended unexpectedly inside a comment or processing instruction"
msgstr "文档在注释或处理指令中意外结束"
#: ../glib/goption.c:861
-msgid "[OPTION...]"
+msgid "[OPTION…]"
msgstr "[选项…]"
#: ../glib/goption.c:977
@@ -4575,22 +4845,22 @@
#: ../glib/goption.c:1113 ../glib/goption.c:1183
#, c-format
-msgid "Cannot parse integer value '%s' for %s"
+msgid "Cannot parse integer value “%s” for %s"
msgstr "无法解析 %2$s 的整数值“%1$s”"
#: ../glib/goption.c:1123 ../glib/goption.c:1191
#, c-format
-msgid "Integer value '%s' for %s out of range"
+msgid "Integer value “%s” for %s out of range"
msgstr "%2$s 所用的整数值“%1$s”超出范围"
#: ../glib/goption.c:1148
#, c-format
-msgid "Cannot parse double value '%s' for %s"
+msgid "Cannot parse double value “%s” for %s"
msgstr "无法解析 %2$s 的双精度值“%1$s”"
#: ../glib/goption.c:1156
#, c-format
-msgid "Double value '%s' for %s out of range"
+msgid "Double value “%s” for %s out of range"
msgstr "“%2$s”所用的双精度值“%1$s”超出范围"
#: ../glib/goption.c:1448 ../glib/goption.c:1527
@@ -4608,332 +4878,332 @@
msgid "Unknown option %s"
msgstr "未知选项 %s"
-#: ../glib/gregex.c:258
+#: ../glib/gregex.c:257
msgid "corrupted object"
msgstr "无效对象"
-#: ../glib/gregex.c:260
+#: ../glib/gregex.c:259
msgid "internal error or corrupted object"
msgstr "内部错误或者无效对象"
-#: ../glib/gregex.c:262
+#: ../glib/gregex.c:261
msgid "out of memory"
msgstr "内存不足"
-#: ../glib/gregex.c:267
+#: ../glib/gregex.c:266
msgid "backtracking limit reached"
msgstr "达到回溯上限"
-#: ../glib/gregex.c:279 ../glib/gregex.c:287
+#: ../glib/gregex.c:278 ../glib/gregex.c:286
msgid "the pattern contains items not supported for partial matching"
msgstr "表达式包含不被部分匹配支持的项"
-#: ../glib/gregex.c:281
+#: ../glib/gregex.c:280
msgid "internal error"
msgstr "内部错误"
-#: ../glib/gregex.c:289
+#: ../glib/gregex.c:288
msgid "back references as conditions are not supported for partial matching"
msgstr "不完全匹配时作为条件的后向引用不被支持."
-#: ../glib/gregex.c:298
+#: ../glib/gregex.c:297
msgid "recursion limit reached"
msgstr "达到递归上限"
-#: ../glib/gregex.c:300
+#: ../glib/gregex.c:299
msgid "invalid combination of newline flags"
msgstr "无效的新行标志组合."
-#: ../glib/gregex.c:302
+#: ../glib/gregex.c:301
msgid "bad offset"
msgstr "错误的偏移值"
-#: ../glib/gregex.c:304
+#: ../glib/gregex.c:303
msgid "short utf8"
msgstr "UTF-8 短编码"
-#: ../glib/gregex.c:306
+#: ../glib/gregex.c:305
msgid "recursion loop"
msgstr "递归循环"
-#: ../glib/gregex.c:310
+#: ../glib/gregex.c:309
msgid "unknown error"
msgstr "未知错误"
-#: ../glib/gregex.c:330
+#: ../glib/gregex.c:329
msgid "\\ at end of pattern"
msgstr "表达式末尾的 \\"
-#: ../glib/gregex.c:333
+#: ../glib/gregex.c:332
msgid "\\c at end of pattern"
msgstr "表达式末尾的 \\c"
-#: ../glib/gregex.c:336
+#: ../glib/gregex.c:335
msgid "unrecognized character following \\"
msgstr "无法识别 \\ 后的字符"
-#: ../glib/gregex.c:339
+#: ../glib/gregex.c:338
msgid "numbers out of order in {} quantifier"
msgstr "{} 里的数字次序颠倒了"
-#: ../glib/gregex.c:342
+#: ../glib/gregex.c:341
msgid "number too big in {} quantifier"
msgstr "{} 里的数字太大了"
-#: ../glib/gregex.c:345
+#: ../glib/gregex.c:344
msgid "missing terminating ] for character class"
msgstr "字符类缺少终结的 ]"
-#: ../glib/gregex.c:348
+#: ../glib/gregex.c:347
msgid "invalid escape sequence in character class"
msgstr "字符类包含无效的转义序列"
-#: ../glib/gregex.c:351
+#: ../glib/gregex.c:350
msgid "range out of order in character class"
msgstr "字符类的范围次序颠倒"
-#: ../glib/gregex.c:354
+#: ../glib/gregex.c:353
msgid "nothing to repeat"
msgstr "没有可以重复的内容"
-#: ../glib/gregex.c:358
+#: ../glib/gregex.c:357
msgid "unexpected repeat"
msgstr "非预期的重复"
-#: ../glib/gregex.c:361
+#: ../glib/gregex.c:360
msgid "unrecognized character after (? or (?-"
msgstr "(? 或 (?- 后有无法识别的字符"
-#: ../glib/gregex.c:364
+#: ../glib/gregex.c:363
msgid "POSIX named classes are supported only within a class"
msgstr "只有类里支持 POSIX 命名的类"
-#: ../glib/gregex.c:367
+#: ../glib/gregex.c:366
msgid "missing terminating )"
msgstr "缺少结束的 )"
-#: ../glib/gregex.c:370
+#: ../glib/gregex.c:369
msgid "reference to non-existent subpattern"
msgstr "引用了不存在的子表达式"
-#: ../glib/gregex.c:373
+#: ../glib/gregex.c:372
msgid "missing ) after comment"
msgstr "注释后缺少 )"
-#: ../glib/gregex.c:376
+#: ../glib/gregex.c:375
msgid "regular expression is too large"
msgstr "正则表达式过长"
-#: ../glib/gregex.c:379
+#: ../glib/gregex.c:378
msgid "failed to get memory"
msgstr "获取内存失败"
-#: ../glib/gregex.c:383
+#: ../glib/gregex.c:382
msgid ") without opening ("
msgstr ") 没有开始的 ("
-#: ../glib/gregex.c:387
+#: ../glib/gregex.c:386
msgid "code overflow"
msgstr "代码溢出"
-#: ../glib/gregex.c:391
+#: ../glib/gregex.c:390
msgid "unrecognized character after (?<"
msgstr "(?< 后有无法识别的字符"
-#: ../glib/gregex.c:394
+#: ../glib/gregex.c:393
msgid "lookbehind assertion is not fixed length"
msgstr "lookbehind 断言不是定长的"
-#: ../glib/gregex.c:397
+#: ../glib/gregex.c:396
msgid "malformed number or name after (?("
msgstr "(?( 后有形式不正确的数字或名称"
-#: ../glib/gregex.c:400
+#: ../glib/gregex.c:399
msgid "conditional group contains more than two branches"
msgstr "条件组包含了超过两个分支"
-#: ../glib/gregex.c:403
+#: ../glib/gregex.c:402
msgid "assertion expected after (?("
msgstr "(?( 后应该有断言"
#. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
#. * sequences here, '(?-54' would be an example for the second group.
#.
-#: ../glib/gregex.c:410
+#: ../glib/gregex.c:409
msgid "(?R or (?[+-]digits must be followed by )"
msgstr "(?R 或 (?[+-]数字 必须跟着 )"
-#: ../glib/gregex.c:413
+#: ../glib/gregex.c:412
msgid "unknown POSIX class name"
msgstr "未知的 POSIX 类名"
-#: ../glib/gregex.c:416
+#: ../glib/gregex.c:415
msgid "POSIX collating elements are not supported"
msgstr "不支持 POSIX 整理元素"
-#: ../glib/gregex.c:419
+#: ../glib/gregex.c:418
msgid "character value in \\x{...} sequence is too large"
msgstr "\\x{...} 序列里的字符值太大了"
-#: ../glib/gregex.c:422
+#: ../glib/gregex.c:421
msgid "invalid condition (?(0)"
msgstr "无效的条件 (?(0)"
-#: ../glib/gregex.c:425
+#: ../glib/gregex.c:424
msgid "\\C not allowed in lookbehind assertion"
msgstr "lookbehind 断言里不允许使用 \\C"
-#: ../glib/gregex.c:432
+#: ../glib/gregex.c:431
msgid "escapes \\L, \\l, \\N{name}, \\U, and \\u are not supported"
msgstr "不支持对 \\L, \\l, \\N{name}, \\U, \\u 进行转义"
-#: ../glib/gregex.c:435
+#: ../glib/gregex.c:434
msgid "recursive call could loop indefinitely"
msgstr "递归调用可能导致无限循环"
-#: ../glib/gregex.c:439
+#: ../glib/gregex.c:438
msgid "unrecognized character after (?P"
msgstr "(?P 有无法识别的字符"
-#: ../glib/gregex.c:442
+#: ../glib/gregex.c:441
msgid "missing terminator in subpattern name"
msgstr "子表达式名里缺少终结符"
-#: ../glib/gregex.c:445
+#: ../glib/gregex.c:444
msgid "two named subpatterns have the same name"
msgstr "两个有名子表达式有相同的名称"
-#: ../glib/gregex.c:448
+#: ../glib/gregex.c:447
msgid "malformed \\P or \\p sequence"
msgstr "形式不正确的 \\P 或 \\p 序列"
-#: ../glib/gregex.c:451
+#: ../glib/gregex.c:450
msgid "unknown property name after \\P or \\p"
msgstr "\\P 或 \\p 后有未知的属性名"
-#: ../glib/gregex.c:454
+#: ../glib/gregex.c:453
msgid "subpattern name is too long (maximum 32 characters)"
msgstr "子表达式名太长了(最多32个字符)"
-#: ../glib/gregex.c:457
+#: ../glib/gregex.c:456
msgid "too many named subpatterns (maximum 10,000)"
msgstr "有名子表达式太多了(最多10,000个)"
-#: ../glib/gregex.c:460
+#: ../glib/gregex.c:459
msgid "octal value is greater than \\377"
msgstr "八进制值大于 \\377"
-#: ../glib/gregex.c:464
+#: ../glib/gregex.c:463
msgid "overran compiling workspace"
msgstr "编译工作区超出正常范围"
-#: ../glib/gregex.c:468
+#: ../glib/gregex.c:467
msgid "previously-checked referenced subpattern not found"
msgstr "未找到之前检查过的引用过的子表达式"
-#: ../glib/gregex.c:471
+#: ../glib/gregex.c:470
msgid "DEFINE group contains more than one branch"
msgstr "DEFINE 组包含多于一个分支"
-#: ../glib/gregex.c:474
+#: ../glib/gregex.c:473
msgid "inconsistent NEWLINE options"
msgstr "不一致的 NEWLINE 选项"
-#: ../glib/gregex.c:477
+#: ../glib/gregex.c:476
msgid ""
"\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
"or by a plain number"
msgstr "\\g 后没有花括号、尖括号或引号括起来的名称或数字，或纯数字"
-#: ../glib/gregex.c:481
+#: ../glib/gregex.c:480
msgid "a numbered reference must not be zero"
msgstr "编号引用不能为0"
-#: ../glib/gregex.c:484
+#: ../glib/gregex.c:483
msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
msgstr "(*ACCEPT), (*FAIL) 和 (*COMMIT) 不允许带参数"
-#: ../glib/gregex.c:487
+#: ../glib/gregex.c:486
msgid "(*VERB) not recognized"
msgstr "无法识别 (*VERB)"
-#: ../glib/gregex.c:490
+#: ../glib/gregex.c:489
msgid "number is too big"
msgstr "数字太大"
-#: ../glib/gregex.c:493
+#: ../glib/gregex.c:492
msgid "missing subpattern name after (?&"
msgstr "(?& 后缺少子表达式名"
-#: ../glib/gregex.c:496
+#: ../glib/gregex.c:495
msgid "digit expected after (?+"
msgstr "(?+ 后应为数字"
-#: ../glib/gregex.c:499
+#: ../glib/gregex.c:498
msgid "] is an invalid data character in JavaScript compatibility mode"
msgstr "Javascript 兼容模式中，] 是非法数据字符"
-#: ../glib/gregex.c:502
+#: ../glib/gregex.c:501
msgid "different names for subpatterns of the same number are not allowed"
msgstr "不允许两个号码相同的子表达式有不同的名称"
-#: ../glib/gregex.c:505
+#: ../glib/gregex.c:504
msgid "(*MARK) must have an argument"
msgstr "(*MARK) 必须有一个参数"
-#: ../glib/gregex.c:508
+#: ../glib/gregex.c:507
msgid "\\c must be followed by an ASCII character"
msgstr "\\c 后面必须跟一个 ASCII 字符"
-#: ../glib/gregex.c:511
+#: ../glib/gregex.c:510
msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
msgstr "\\k 后没有用花括号、尖括号或引号括起来的名称"
-#: ../glib/gregex.c:514
+#: ../glib/gregex.c:513
msgid "\\N is not supported in a class"
msgstr "类中不支持 \\N"
-#: ../glib/gregex.c:517
+#: ../glib/gregex.c:516
msgid "too many forward references"
msgstr "太多前向引用"
-#: ../glib/gregex.c:520
+#: ../glib/gregex.c:519
msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
msgstr "在 (*MARK), (*PRUNE), (*SKIP) 或者 (*THEN) 中名称太长"
-#: ../glib/gregex.c:523
+#: ../glib/gregex.c:522
msgid "character value in \\u.... sequence is too large"
msgstr "\\u.... 序列里的字符值太大了"
-#: ../glib/gregex.c:746 ../glib/gregex.c:1977
+#: ../glib/gregex.c:745 ../glib/gregex.c:1977
#, c-format
msgid "Error while matching regular expression %s: %s"
msgstr "匹配正则表达式 %s 出现错误：%s"
-#: ../glib/gregex.c:1317
+#: ../glib/gregex.c:1316
msgid "PCRE library is compiled without UTF8 support"
msgstr "PCRE 库编译时未包含 UTF8 支持"
-#: ../glib/gregex.c:1321
+#: ../glib/gregex.c:1320
msgid "PCRE library is compiled without UTF8 properties support"
msgstr "PCRE 库编译时未包含 UTF8 属性支持"
-#: ../glib/gregex.c:1329
+#: ../glib/gregex.c:1328
msgid "PCRE library is compiled with incompatible options"
msgstr "PCRE 库编译时使用了不兼容的选项"
-#: ../glib/gregex.c:1358
+#: ../glib/gregex.c:1357
#, c-format
msgid "Error while optimizing regular expression %s: %s"
msgstr "优化正则表达式 %s 时出错：%s"
-#: ../glib/gregex.c:1438
+#: ../glib/gregex.c:1437
#, c-format
msgid "Error while compiling regular expression %s at char %d: %s"
msgstr "编译正则表达式 %s (于字符 %d 处)时出错：%s"
#: ../glib/gregex.c:2413
-msgid "hexadecimal digit or '}' expected"
+msgid "hexadecimal digit or “}” expected"
msgstr "期望十六进制数或“}”"
#: ../glib/gregex.c:2429
@@ -4941,7 +5211,7 @@
msgstr "期望十六进制数"
#: ../glib/gregex.c:2469
-msgid "missing '<' in symbolic reference"
+msgid "missing “<” in symbolic reference"
msgstr "在符号引用中缺少“<”"
#: ../glib/gregex.c:2478
@@ -4961,7 +5231,7 @@
msgstr "非法的符号引用"
#: ../glib/gregex.c:2576
-msgid "stray final '\\'"
+msgid "stray final “\\”"
msgstr "丢失了最后的“\\”"
#: ../glib/gregex.c:2580
@@ -4970,238 +5240,255 @@
#: ../glib/gregex.c:2590
#, c-format
-msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
+msgid "Error while parsing replacement text “%s” at char %lu: %s"
msgstr "解析替换文本“%s”时在字符 %lu 处发生错误：%s"
-#: ../glib/gshell.c:96
-msgid "Quoted text doesn't begin with a quotation mark"
+#: ../glib/gshell.c:94
+msgid "Quoted text doesn’t begin with a quotation mark"
msgstr "引用的文本不以引号开头"
-#: ../glib/gshell.c:186
+#: ../glib/gshell.c:184
msgid "Unmatched quotation mark in command line or other shell-quoted text"
msgstr "命令行或其他 shell 引用文本中出现不匹配的引号"
-#: ../glib/gshell.c:582
+#: ../glib/gshell.c:580
#, c-format
-msgid "Text ended just after a '\\' character. (The text was '%s')"
+msgid "Text ended just after a “\\” character. (The text was “%s”)"
msgstr "文本在一个“\\”字符后结束。(文本为“%s”)"
-#: ../glib/gshell.c:589
+#: ../glib/gshell.c:587
#, c-format
-msgid "Text ended before matching quote was found for %c. (The text was '%s')"
+msgid "Text ended before matching quote was found for %c. (The text was “%s”)"
msgstr "在找到为 %c 匹配的引用之前，文本已结束。(文本为“%s”)"
-#: ../glib/gshell.c:601
+#: ../glib/gshell.c:599
msgid "Text was empty (or contained only whitespace)"
msgstr "文本为空(或仅含空白字符)"
-#: ../glib/gspawn.c:209
+#: ../glib/gspawn.c:253
#, c-format
msgid "Failed to read data from child process (%s)"
msgstr "从子进程中读取数据失败(%s)"
-#: ../glib/gspawn.c:353
+#: ../glib/gspawn.c:401
#, c-format
msgid "Unexpected error in select() reading data from a child process (%s)"
msgstr "select() 在从子进程中读取数据时出现异常错误 (%s)"
-#: ../glib/gspawn.c:438
+#: ../glib/gspawn.c:486
#, c-format
msgid "Unexpected error in waitpid() (%s)"
msgstr "waitpid() 出现异常错误 (%s)"
-#: ../glib/gspawn.c:844 ../glib/gspawn-win32.c:1233
+#: ../glib/gspawn.c:897 ../glib/gspawn-win32.c:1231
#, c-format
msgid "Child process exited with code %ld"
msgstr "子进程退出，代码 %ld"
-#: ../glib/gspawn.c:852
+#: ../glib/gspawn.c:905
#, c-format
msgid "Child process killed by signal %ld"
msgstr "子进程已由信号 %ld 杀死"
-#: ../glib/gspawn.c:859
+#: ../glib/gspawn.c:912
#, c-format
msgid "Child process stopped by signal %ld"
msgstr "子进程已由信号 %ld 停止"
-#: ../glib/gspawn.c:866
+#: ../glib/gspawn.c:919
#, c-format
msgid "Child process exited abnormally"
msgstr "子进程异常中止"
-#: ../glib/gspawn.c:1271 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
+#: ../glib/gspawn.c:1324 ../glib/gspawn-win32.c:337 ../glib/gspawn-win32.c:345
#, c-format
msgid "Failed to read from child pipe (%s)"
msgstr "从子管道中读取失败(%s)"
-#: ../glib/gspawn.c:1341
+#: ../glib/gspawn.c:1394
#, c-format
msgid "Failed to fork (%s)"
msgstr "fork 失败(%s)"
-#: ../glib/gspawn.c:1490 ../glib/gspawn-win32.c:370
+#: ../glib/gspawn.c:1543 ../glib/gspawn-win32.c:368
#, c-format
-msgid "Failed to change to directory '%s' (%s)"
-msgstr "更改到目录“%s”失败(%s)"
+msgid "Failed to change to directory “%s” (%s)"
+msgstr "切换到目录“%s”失败(%s)"
-#: ../glib/gspawn.c:1500
+#: ../glib/gspawn.c:1553
#, c-format
-msgid "Failed to execute child process \"%s\" (%s)"
-msgstr "执行子进程“%s\"失败(%s)"
+msgid "Failed to execute child process “%s” (%s)"
+msgstr "执行子进程“%s”失败(%s)"
-#: ../glib/gspawn.c:1510
+#: ../glib/gspawn.c:1563
#, c-format
msgid "Failed to redirect output or input of child process (%s)"
msgstr "重定向子进程(%s)的输入或输出失败"
-#: ../glib/gspawn.c:1519
+#: ../glib/gspawn.c:1572
#, c-format
msgid "Failed to fork child process (%s)"
msgstr "fork 子进程失败 (%s)"
-#: ../glib/gspawn.c:1527
+#: ../glib/gspawn.c:1580
#, c-format
-msgid "Unknown error executing child process \"%s\""
+msgid "Unknown error executing child process “%s”"
msgstr "执行子进程“%s”时出现未知错误"
-#: ../glib/gspawn.c:1551
+#: ../glib/gspawn.c:1604
#, c-format
msgid "Failed to read enough data from child pid pipe (%s)"
msgstr "从子进程管道中读取足够的数据失败(%s)"
-#: ../glib/gspawn-win32.c:283
+#: ../glib/gspawn-win32.c:281
msgid "Failed to read data from child process"
msgstr "从子进程中读取数据失败"
-#: ../glib/gspawn-win32.c:300
+#: ../glib/gspawn-win32.c:298
#, c-format
msgid "Failed to create pipe for communicating with child process (%s)"
msgstr "创建与子进程通讯的管道失败(%s)"
-#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495
+#: ../glib/gspawn-win32.c:374 ../glib/gspawn-win32.c:493
#, c-format
msgid "Failed to execute child process (%s)"
msgstr "执行子进程失败(%s)"
-#: ../glib/gspawn-win32.c:445
+#: ../glib/gspawn-win32.c:443
#, c-format
msgid "Invalid program name: %s"
msgstr "无效的程序名：%s"
-#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722
-#: ../glib/gspawn-win32.c:1297
+#: ../glib/gspawn-win32.c:453 ../glib/gspawn-win32.c:720
#, c-format
msgid "Invalid string in argument vector at %d: %s"
msgstr "%d 处的参数中有无效的字符串：%s"
-#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737
-#: ../glib/gspawn-win32.c:1330
+#: ../glib/gspawn-win32.c:464 ../glib/gspawn-win32.c:735
#, c-format
msgid "Invalid string in environment: %s"
msgstr "环境中有无效的字符串：%s"
-#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278
+#: ../glib/gspawn-win32.c:716
#, c-format
msgid "Invalid working directory: %s"
msgstr "无效的工作目录：%s"
-#: ../glib/gspawn-win32.c:783
+#: ../glib/gspawn-win32.c:781
#, c-format
msgid "Failed to execute helper program (%s)"
msgstr "执行助手程序(%s)失败"
-#: ../glib/gspawn-win32.c:997
+#: ../glib/gspawn-win32.c:995
msgid ""
"Unexpected error in g_io_channel_win32_poll() reading data from a child "
"process"
msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
-#: ../glib/gutf8.c:797
+#: ../glib/gstrfuncs.c:3247 ../glib/gstrfuncs.c:3348
+msgid "Empty string is not a number"
+msgstr "空字符串不是数字"
+
+#: ../glib/gstrfuncs.c:3271
+#, c-format
+msgid "“%s” is not a signed number"
+msgstr "“%s”不是有效的有符号数值"
+
+#: ../glib/gstrfuncs.c:3281 ../glib/gstrfuncs.c:3384
+#, c-format
+msgid "Number “%s” is out of bounds [%s, %s]"
+msgstr "数字 “%s”越界 [%s, %s]"
+
+#: ../glib/gstrfuncs.c:3374
+#, c-format
+msgid "“%s” is not an unsigned number"
+msgstr "“%s”不是有效的无符号数值"
+
+#: ../glib/gutf8.c:808
msgid "Failed to allocate memory"
msgstr "分配内存失败"
-#: ../glib/gutf8.c:930
+#: ../glib/gutf8.c:941
msgid "Character out of range for UTF-8"
msgstr "字符超出 UTF-8 范围"
-#: ../glib/gutf8.c:1031 ../glib/gutf8.c:1040 ../glib/gutf8.c:1170
-#: ../glib/gutf8.c:1179 ../glib/gutf8.c:1318 ../glib/gutf8.c:1415
+#: ../glib/gutf8.c:1042 ../glib/gutf8.c:1051 ../glib/gutf8.c:1181
+#: ../glib/gutf8.c:1190 ../glib/gutf8.c:1329 ../glib/gutf8.c:1426
msgid "Invalid sequence in conversion input"
msgstr "转换输入中出现无效序列"
-#: ../glib/gutf8.c:1329 ../glib/gutf8.c:1426
+#: ../glib/gutf8.c:1340 ../glib/gutf8.c:1437
msgid "Character out of range for UTF-16"
msgstr "字符超出 UTF-16 范围"
-#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272
+#: ../glib/gutils.c:2214
+#, c-format
+msgid "%.1f kB"
+msgstr "%.1f KB"
+
+#: ../glib/gutils.c:2215 ../glib/gutils.c:2385
+#, c-format
+msgid "%.1f MB"
+msgstr "%.1f MB"
+
+#: ../glib/gutils.c:2216 ../glib/gutils.c:2390
+#, c-format
+msgid "%.1f GB"
+msgstr "%.1f GB"
+
+#: ../glib/gutils.c:2217 ../glib/gutils.c:2395
+#, c-format
+msgid "%.1f TB"
+msgstr "%.1f TB"
+
+#: ../glib/gutils.c:2218 ../glib/gutils.c:2400
+#, c-format
+msgid "%.1f PB"
+msgstr "%.1f PB"
+
+#: ../glib/gutils.c:2219 ../glib/gutils.c:2405
+#, c-format
+msgid "%.1f EB"
+msgstr "%.1f EB"
+
+#: ../glib/gutils.c:2222
+#, c-format
+msgid "%.1f KiB"
+msgstr "%.1f KiB"
+
+#: ../glib/gutils.c:2223
+#, c-format
+msgid "%.1f MiB"
+msgstr "%.1f MiB"
+
+#: ../glib/gutils.c:2224
+#, c-format
+msgid "%.1f GiB"
+msgstr "%.1f GiB"
+
+#: ../glib/gutils.c:2225
+#, c-format
+msgid "%.1f TiB"
+msgstr "%.1f TiB"
+
+#: ../glib/gutils.c:2226
+#, c-format
+msgid "%.1f PiB"
+msgstr "%.1f PiB"
+
+#: ../glib/gutils.c:2227
+#, c-format
+msgid "%.1f EiB"
+msgstr "%.1f EiB"
+
+#: ../glib/gutils.c:2253 ../glib/gutils.c:2367
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 字节"
-#: ../glib/gutils.c:2145
-#, c-format
-msgid "%.1f KiB"
-msgstr "%.1f KiB"
-
-#: ../glib/gutils.c:2147
-#, c-format
-msgid "%.1f MiB"
-msgstr "%.1f MiB"
-
-#: ../glib/gutils.c:2150
-#, c-format
-msgid "%.1f GiB"
-msgstr "%.1f GiB"
-
-#: ../glib/gutils.c:2153
-#, c-format
-msgid "%.1f TiB"
-msgstr "%.1f TiB"
-
-#: ../glib/gutils.c:2156
-#, c-format
-msgid "%.1f PiB"
-msgstr "%.1f PiB"
-
-#: ../glib/gutils.c:2159
-#, c-format
-msgid "%.1f EiB"
-msgstr "%.1f EiB"
-
-#: ../glib/gutils.c:2172
-#, c-format
-msgid "%.1f kB"
-msgstr "%.1f KB"
-
-#: ../glib/gutils.c:2175 ../glib/gutils.c:2290
-#, c-format
-msgid "%.1f MB"
-msgstr "%.1f MB"
-
-#: ../glib/gutils.c:2178 ../glib/gutils.c:2295
-#, c-format
-msgid "%.1f GB"
-msgstr "%.1f GB"
-
-#: ../glib/gutils.c:2180 ../glib/gutils.c:2300
-#, c-format
-msgid "%.1f TB"
-msgstr "%.1f TB"
-
-#: ../glib/gutils.c:2183 ../glib/gutils.c:2305
-#, c-format
-msgid "%.1f PB"
-msgstr "%.1f PB"
-
-#: ../glib/gutils.c:2186 ../glib/gutils.c:2310
-#, c-format
-msgid "%.1f EB"
-msgstr "%.1f EB"
-
#. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2223
+#: ../glib/gutils.c:2318
#, c-format
msgid "%s byte"
msgid_plural "%s bytes"
@@ -5212,61 +5499,83 @@
#. * compatibility. Users will not see this string unless a program is using this deprecated function.
#. * Please translate as literally as possible.
#.
-#: ../glib/gutils.c:2285
+#: ../glib/gutils.c:2380
#, c-format
msgid "%.1f KB"
msgstr "%.1f KB"
-#, fuzzy
-#~| msgid "[ARGS...]"
-#~ msgid "[ARGS…]"
-#~ msgstr "[ARGS...]"
+#~ msgid "Error: object path not specified.\n"
+#~ msgstr "错误：没有指定对象路径。\n"
-#, fuzzy
-#~| msgid ""
-#~| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
-#~| "variable - unknown value '%s'"
-#~ msgid ""
-#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
-#~ "variable — unknown value “%s”"
-#~ msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
+#~ msgid "Error: signal not specified.\n"
+#~ msgstr "错误：没有指定对象。\n"
-#, fuzzy
-#~| msgid "Error creating directory '%s': %s"
-#~ msgid "Error creating directory “%s”: %s"
-#~ msgstr "创建目录“%s”出错：%s"
+#~ msgid "Error: signal must be the fully-qualified name.\n"
+#~ msgstr "错误：信号必须是完全限定名。\n"
-#, fuzzy
-#~| msgid "Error opening file '%s': %s"
-#~ msgid "Error opening file “%s”: %s"
-#~ msgstr "打开文件“%s”出错：%s"
+#~ msgid "Error opening nonce file '%s': %s"
+#~ msgstr "打开临时文件“%s”时出错：%s"
-#, fuzzy
-#~| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
-#~ msgid "mount doesn’t implement “eject” or “eject_with_operation”"
-#~ msgstr "挂载未执行“eject”或“eject_with_operation”"
+#~ msgid "Error creating directory '%s': %s"
+#~ msgstr "创建目录“%s”时出错：%s"
-#, fuzzy
-#~| msgid "Error reading file %s: %s"
-#~ msgid "Error reading file “%s”: %s"
-#~ msgstr "读取文件 %s 出错：%s"
+#~ msgid "No such interface"
+#~ msgstr "无此接口"
-#, fuzzy
-#~| msgid "Failed to write file '%s': fsync() failed: %s"
-#~ msgid "Failed to write file “%s”: fsync() failed: %s"
+#~ msgid "No files given"
+#~ msgstr "未给出文件"
+
+#~ msgid "Error getting writable attributes: %s\n"
+#~ msgstr "获取可写属性出错：%s\n"
+
+#~ msgid "Error mounting location: %s\n"
+#~ msgstr "挂载位置出错：%s\n"
+
+#~ msgid "Error unmounting mount: %s\n"
+#~ msgstr "卸载挂载点出错：%s\n"
+
+#~ msgid "Error finding enclosing mount: %s\n"
+#~ msgstr "寻找闭合挂载出错：%s\n"
+
+#~ msgid "Error ejecting mount: %s\n"
+#~ msgstr "弹出挂载出错：%s\n"
+
+#~ msgid "Error mounting %s: %s\n"
+#~ msgstr "挂载 %s 出错：%s\n"
+
+#~ msgid "No files to open"
+#~ msgstr "没有要打开的文件"
+
+#~ msgid "No files to delete"
+#~ msgstr "没有要删除的文件"
+
+#~ msgid "Error setting attribute: %s\n"
+#~ msgstr "设置属性出错：%s\n"
+
+#~ msgid "Error opening file '%s': %s"
+#~ msgstr "打开文件“%s”时出错：%s"
+
+#~ msgid "mount doesn't implement \"unmount\" or \"unmount_with_operation\""
+#~ msgstr "挂载未实现“unmount”或“unmount_with_operation”"
+
+#~ msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+#~ msgstr "挂载未实现“eject”或“eject_with_operation”"
+
+#~ msgid "Error opening directory '%s': %s"
+#~ msgstr "打开目录“%s”时发生错误：%s"
+
+#~ msgid "Error reading file '%s': %s"
+#~ msgstr "读取文件“%s”出错：%s"
+
+#~ msgid "Failed to write file '%s': fsync() failed: %s"
#~ msgstr "写入文件“%s”失败：fsync() 失败：%s"
-#, fuzzy
-#~| msgid ""
-#~| "Key file contains key '%s' which has a value that cannot be interpreted."
#~ msgid ""
-#~ "Key file contains key “%s” which has a value that cannot be interpreted."
+#~ "Key file contains key '%s' which has a value that cannot be interpreted."
#~ msgstr "键文件包含键“%s”，其值无法解释。"
-#, fuzzy
-#~| msgid "Failed to execute child process \"%s\" (%s)"
-#~ msgid "Failed to execute child process “%s” (%s)"
-#~ msgstr "执行子进程“%s”失败(%s)"
+#~ msgid "Failed to execute child process \"%s\" (%s)"
+#~ msgstr "执行子进程“%s\"失败(%s)"
#~ msgid "Error renaming file: %s"
#~ msgstr "重命名文件时出错：%s"
