[glib] Update Simplified Chinese translation
- From: Aron Xu <aronxu src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Update Simplified Chinese translation
- Date: Thu, 28 Feb 2013 13:07:11 +0000 (UTC)
commit 3f678afa0547f0bacf0579c82a8939c25f022643
Author: Wylmer Wang <wantinghard gmail com>
Date: Thu Feb 28 21:07:02 2013 +0800
Update Simplified Chinese translation
po/zh_CN.po | 1969 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 1082 insertions(+), 887 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c12e0e2..b4319bd 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -12,6 +12,7 @@
# wei Li <lw124124 gmail com>, 2011.
# Lele Long <schemacs gmail com>, 2011.
# Mike Manilone <crtmike gmail com>, 2012.
+# keyring <keyrings 163 com>, 2013.
#
# Note:"fd" is abbr. of "File Descriptor", 文件描述符
#
@@ -20,243 +21,267 @@ msgstr ""
"Project-Id-Version: glib master\n"
"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
"product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-14 16:35+0000\n"
-"PO-Revision-Date: 2012-04-14 21:15+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2013-02-27 13:51+0000\n"
+"PO-Revision-Date: 2013-02-28 19:54+0800\n"
+"Last-Translator: keyring <keyrings 163 com>\n"
"Language-Team: Chinese (simplified) <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"
-"Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
-#: ../gio/gbufferedinputstream.c:411 ../gio/gbufferedinputstream.c:492
-#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:317
-#: ../gio/ginputstream.c:556 ../gio/ginputstream.c:680
-#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:753
+#: ../gio/gbufferedinputstream.c:427 ../gio/gbufferedinputstream.c:506
+#: ../gio/ginputstream.c:185 ../gio/ginputstream.c:377
+#: ../gio/ginputstream.c:615 ../gio/ginputstream.c:833
+#: ../gio/goutputstream.c:203 ../gio/goutputstream.c:732
+#: ../gio/gpollableinputstream.c:207 ../gio/gpollableoutputstream.c:208
#, c-format
msgid "Too large count value passed to %s"
-msgstr "传递给 %s 的计数值太大了"
+msgstr "传递给 %s 的计数值太大"
+
+#: ../gio/gbufferedinputstream.c:899 ../gio/gbufferedoutputstream.c:581
+#: ../gio/gdataoutputstream.c:568
+msgid "Seek not supported on base stream"
+msgstr "基流(base stream)不支持定位(seek)"
+
+#: ../gio/gbufferedinputstream.c:945
+msgid "Cannot truncate GBufferedInputStream"
+msgstr "无法截断 GBufferedInputStream"
-#: ../gio/gbufferedinputstream.c:882 ../gio/ginputstream.c:888
-#: ../gio/giostream.c:292 ../gio/goutputstream.c:1228
+#: ../gio/gbufferedinputstream.c:990 ../gio/ginputstream.c:1023
+#: ../gio/giostream.c:291 ../gio/goutputstream.c:1334
msgid "Stream is already closed"
msgstr "流已经关闭"
-#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1836
-#: ../gio/gdbusconnection.c:1928 ../gio/gdbusprivate.c:1414
-#: ../gio/glocalfile.c:2133 ../gio/gsimpleasyncresult.c:833
-#: ../gio/gsimpleasyncresult.c:859
+#: ../gio/gbufferedoutputstream.c:618 ../gio/gdataoutputstream.c:598
+msgid "Truncate not supported on base stream"
+msgstr "基流(base stream)不支持截断"
+
+#: ../gio/gcancellable.c:318 ../gio/gdbusconnection.c:1885
+#: ../gio/gdbusconnection.c:1977 ../gio/gdbusprivate.c:1421
+#: ../gio/glocalfile.c:2172 ../gio/gsimpleasyncresult.c:843
+#: ../gio/gsimpleasyncresult.c:869
#, c-format
msgid "Operation was cancelled"
msgstr "操作被取消"
-#: ../gio/gcharsetconverter.c:263
+#: ../gio/gcharsetconverter.c:262
msgid "Invalid object, not initialized"
msgstr "无效的对象，未初始化"
-#: ../gio/gcharsetconverter.c:284 ../gio/gcharsetconverter.c:312
+#: ../gio/gcharsetconverter.c:283 ../gio/gcharsetconverter.c:311
msgid "Incomplete multibyte sequence in input"
msgstr "输入中有不完整的多字节序列"
-#: ../gio/gcharsetconverter.c:318 ../gio/gcharsetconverter.c:327
+#: ../gio/gcharsetconverter.c:317 ../gio/gcharsetconverter.c:326
msgid "Not enough space in destination"
msgstr "目标位置没有足够的空间"
-#: ../gio/gcharsetconverter.c:345 ../gio/gdatainputstream.c:854
-#: ../gio/gdatainputstream.c:1294 ../glib/gconvert.c:768
-#: ../glib/gconvert.c:1160 ../glib/giochannel.c:1583 ../glib/giochannel.c:1625
-#: ../glib/giochannel.c:2468 ../glib/gutf8.c:841 ../glib/gutf8.c:1292
+#: ../gio/gcharsetconverter.c:344 ../gio/gdatainputstream.c:854
+#: ../gio/gdatainputstream.c:1264 ../glib/gconvert.c:764
+#: ../glib/gconvert.c:1156 ../glib/giochannel.c:1586 ../glib/giochannel.c:1628
+#: ../glib/giochannel.c:2472 ../glib/gutf8.c:841 ../glib/gutf8.c:1292
msgid "Invalid byte sequence in conversion input"
msgstr "转换输入中出现无效字符序列"
-#: ../gio/gcharsetconverter.c:350 ../glib/gconvert.c:776
-#: ../glib/gconvert.c:1085 ../glib/giochannel.c:1590 ../glib/giochannel.c:2480
+#: ../gio/gcharsetconverter.c:349 ../glib/gconvert.c:772
+#: ../glib/gconvert.c:1081 ../glib/giochannel.c:1593 ../glib/giochannel.c:2484
#, c-format
msgid "Error during conversion: %s"
msgstr "转换过程中出错：%s"
-#: ../gio/gcharsetconverter.c:447 ../gio/gsocket.c:961
+#: ../gio/gcharsetconverter.c:446 ../gio/gsocket.c:991
msgid "Cancellable initialization not supported"
msgstr "不支持可撤销的初始化"
-#: ../gio/gcharsetconverter.c:458 ../glib/gconvert.c:568
-#: ../glib/gconvert.c:646 ../glib/giochannel.c:1411
+#: ../gio/gcharsetconverter.c:457 ../glib/gconvert.c:564
+#: ../glib/gconvert.c:642 ../glib/giochannel.c:1414
#, c-format
msgid "Conversion from character set '%s' to '%s' is not supported"
msgstr "不支持从字符集“%s”到“%s”的转换"
-#: ../gio/gcharsetconverter.c:462 ../glib/gconvert.c:572
-#: ../glib/gconvert.c:650
+#: ../gio/gcharsetconverter.c:461 ../glib/gconvert.c:568
+#: ../glib/gconvert.c:646
#, c-format
msgid "Could not open converter from '%s' to '%s'"
msgstr "无法打开从“%s”到“%s”的转换器"
-#: ../gio/gcontenttype.c:180
+#: ../gio/gcontenttype.c:335
+#, c-format
+msgid "%s type"
+msgstr "%s 类型"
+
+#: ../gio/gcontenttype-win32.c:162
msgid "Unknown type"
msgstr "未知类型"
-#: ../gio/gcontenttype.c:181
+#: ../gio/gcontenttype-win32.c:163
#, c-format
msgid "%s filetype"
msgstr "%s 文件类型"
-#: ../gio/gcontenttype.c:680
-#, c-format
-msgid "%s type"
-msgstr "%s 类型"
-
-#: ../gio/gcredentials.c:273 ../gio/gcredentials.c:495
+#: ../gio/gcredentials.c:264 ../gio/gcredentials.c:528
msgid "GCredentials is not implemented on this OS"
msgstr "此操作系统上没有实现 GCredentials"
-#: ../gio/gcredentials.c:447
+#: ../gio/gcredentials.c:438
msgid "There is no GCredentials support for your platform"
msgstr "您的系统尚不支持 GCredentials"
+#: ../gio/gcredentials.c:480
+msgid "GCredentials does not contain a process ID on this OS"
+msgstr "此操作系统上的 GCredentials 未包含一个进程 ID"
+
#: ../gio/gdatainputstream.c:311
msgid "Unexpected early end-of-stream"
msgstr "非预期的过早的流结束符"
-#: ../gio/gdbusaddress.c:142 ../gio/gdbusaddress.c:230
-#: ../gio/gdbusaddress.c:311
+#: ../gio/gdbusaddress.c:150 ../gio/gdbusaddress.c:238
+#: ../gio/gdbusaddress.c:319
#, c-format
msgid "Unsupported key `%s' in address entry `%s'"
msgstr "地址条目“%2$s”中不支持的键“%1$s”"
-#: ../gio/gdbusaddress.c:169
+#: ../gio/gdbusaddress.c:177
#, c-format
msgid ""
"Address `%s' is invalid (need exactly one of path, tmpdir or abstract keys)"
msgstr "地址 %s 无效(需要指定的一个路径、临时目录或抽象键)"
-#: ../gio/gdbusaddress.c:182
+#: ../gio/gdbusaddress.c:190
#, c-format
msgid "Meaningless key/value pair combination in address entry `%s'"
msgstr "地址条目“%s”中无意义的键值对组合"
-#: ../gio/gdbusaddress.c:245 ../gio/gdbusaddress.c:326
+#: ../gio/gdbusaddress.c:253 ../gio/gdbusaddress.c:334
#, c-format
msgid "Error in address `%s' - the port attribute is malformed"
msgstr "地址“%s”中有错误 - 端口属性格式错误"
-#: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
+#: ../gio/gdbusaddress.c:264 ../gio/gdbusaddress.c:345
#, c-format
msgid "Error in address `%s' - the family attribute is malformed"
msgstr "地址“%s”中有错误 - 类别 (family) 属性格式错误"
-#: ../gio/gdbusaddress.c:446
+#: ../gio/gdbusaddress.c:454
#, c-format
-msgid "Address element `%s', does not contain a colon (:)"
-msgstr "地址元素“%s”不包含冒号 (:)"
+msgid "Address element `%s' does not contain a colon (:)"
+msgstr "地址元素“%s”不包含冒号(:)"
-#: ../gio/gdbusaddress.c:467
+#: ../gio/gdbusaddress.c:475
#, 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”，不包含等号"
+msgstr "地址元素“%3$s”中的第 %1$d 个键值对 “%2$s”，不包含等号"
-#: ../gio/gdbusaddress.c:481
+#: ../gio/gdbusaddress.c:489
#, c-format
msgid ""
"Error unescaping key or value in Key/Value pair %d, `%s', in address element "
"`%s'"
msgstr "在键/值对 %d ，“%s”在地址元素“%s”，中去转义发生错误"
-#: ../gio/gdbusaddress.c:559
+#: ../gio/gdbusaddress.c:567
#, 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”之一的键被设置。"
-#: ../gio/gdbusaddress.c:595
+#: ../gio/gdbusaddress.c:603
#, c-format
msgid "Error in address `%s' - the host attribute is missing or malformed"
msgstr "地址“%s”中有错误 - 主机属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:609
+#: ../gio/gdbusaddress.c:617
#, c-format
msgid "Error in address `%s' - the port attribute is missing or malformed"
msgstr "地址“%s”中有错误 - 端口属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:623
+#: ../gio/gdbusaddress.c:631
#, c-format
msgid "Error in address `%s' - the noncefile attribute is missing or malformed"
msgstr "地址“%s”中有错误 - noncefile 属性丢失或格式错误"
-#: ../gio/gdbusaddress.c:644
+#: ../gio/gdbusaddress.c:652
msgid "Error auto-launching: "
msgstr "自启动出错："
-#: ../gio/gdbusaddress.c:652
+#: ../gio/gdbusaddress.c:660
#, c-format
msgid "Unknown or unsupported transport `%s' for address `%s'"
msgstr "对地址 %2$s 的未知或不支持的传输 %1$s"
-#: ../gio/gdbusaddress.c:688
+#: ../gio/gdbusaddress.c:696
#, c-format
msgid "Error opening nonce file `%s': %s"
msgstr "打开临时文件“%s”出错：%s"
-#: ../gio/gdbusaddress.c:706
+#: ../gio/gdbusaddress.c:714
#, c-format
msgid "Error reading from nonce file `%s': %s"
msgstr "读取临时文件“%s”出错：%s"
-#: ../gio/gdbusaddress.c:715
+#: ../gio/gdbusaddress.c:723
#, c-format
msgid "Error reading from nonce file `%s', expected 16 bytes, got %d"
msgstr "读取临时文件“%s”出错，预期 16 个字节，得到了 %d 个字节"
-#: ../gio/gdbusaddress.c:733
+#: ../gio/gdbusaddress.c:741
#, c-format
msgid "Error writing contents of nonce file `%s' to stream:"
msgstr "写入临时文件 %s 的内容到流的过程中出错："
-#: ../gio/gdbusaddress.c:952
+#: ../gio/gdbusaddress.c:960
msgid "The given address is empty"
msgstr "给出的地址为空"
-#: ../gio/gdbusaddress.c:1021
+#: ../gio/gdbusaddress.c:1030
+#, c-format
+msgid "Cannot spawn a message bus when setuid"
+msgstr "无法在 setuid 时启动一条消息总线"
+
+#: ../gio/gdbusaddress.c:1037
msgid "Cannot spawn a message bus without a machine-id: "
msgstr "无法在无机器 ID 时启动一条消息总线："
-#: ../gio/gdbusaddress.c:1058
+#: ../gio/gdbusaddress.c:1079
#, c-format
msgid "Error spawning command line `%s': "
msgstr "启动命令 %s 出错："
-#: ../gio/gdbusaddress.c:1069
+#: ../gio/gdbusaddress.c:1296
#, c-format
-msgid "Abnormal program termination spawning command line `%s': %s"
-msgstr "命令 %s 非正常程序终止：%s"
+msgid "(Type any character to close this window)\n"
+msgstr "(按任意键关闭本窗口)\n"
-#: ../gio/gdbusaddress.c:1083
+#: ../gio/gdbusaddress.c:1421
#, c-format
-msgid "Command line `%s' exited with non-zero exit status %d: %s"
-msgstr "命令 %s 以非零状态数 %d 退出：%s"
+msgid "Session dbus not running, and autolaunch failed"
+msgstr "dbus 会话未运行，自动启动失败"
-#: ../gio/gdbusaddress.c:1156
+#: ../gio/gdbusaddress.c:1442
#, c-format
msgid "Cannot determine session bus address (not implemented for this OS)"
msgstr "无法确定会话总线地址(尚未在此操作系统上实现)"
-#: ../gio/gdbusaddress.c:1255 ../gio/gdbusconnection.c:6706
+#: ../gio/gdbusaddress.c:1541 ../gio/gdbusconnection.c:6757
#, c-format
msgid ""
"Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment variable "
"- unknown value `%s'"
msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
-#: ../gio/gdbusaddress.c:1264 ../gio/gdbusconnection.c:6715
+#: ../gio/gdbusaddress.c:1550 ../gio/gdbusconnection.c:6766
msgid ""
"Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
"variable is not set"
msgstr "无法确定总线地址，因为环境变量 DBUS_STARTER_BUS_TYPE 未设置"
-#: ../gio/gdbusaddress.c:1274
+#: ../gio/gdbusaddress.c:1560
#, c-format
msgid "Unknown bus type %d"
msgstr "未知的总线类型 %d"
@@ -275,7 +300,7 @@ msgid ""
"Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
msgstr "用尽了所有可用的认证机制(已尝试：%s)(可用的：%s)"
-#: ../gio/gdbusauth.c:1174
+#: ../gio/gdbusauth.c:1175
msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消"
@@ -300,18 +325,18 @@ msgstr "创建目录“%s”出错：%s"
msgid "Error opening keyring `%s' for reading: "
msgstr "打开密钥环“%s”读取时出错："
-#: ../gio/gdbusauthmechanismsha1.c:406 ../gio/gdbusauthmechanismsha1.c:718
+#: ../gio/gdbusauthmechanismsha1.c:406 ../gio/gdbusauthmechanismsha1.c:719
#, c-format
msgid "Line %d of the keyring at `%s' with content `%s' is malformed"
msgstr "%2$s 处的密钥环的 %1$d 行有不符合格式的内容 %3$s"
-#: ../gio/gdbusauthmechanismsha1.c:420 ../gio/gdbusauthmechanismsha1.c:732
+#: ../gio/gdbusauthmechanismsha1.c:420 ../gio/gdbusauthmechanismsha1.c:733
#, c-format
msgid ""
"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:435 ../gio/gdbusauthmechanismsha1.c:746
+#: ../gio/gdbusauthmechanismsha1.c:435 ../gio/gdbusauthmechanismsha1.c:747
#, c-format
msgid ""
"Second token of line %d of the keyring at `%s' with content `%s' is malformed"
@@ -322,158 +347,163 @@ msgstr "%2$s 处的密钥环的 %1$d 行第二个令牌有不符合格式的内
msgid "Didn't find cookie with id %d in the keyring at `%s'"
msgstr "未在 %2$s 处的密钥环中找到 ID 为 %1$d 的 cookie"
-#: ../gio/gdbusauthmechanismsha1.c:536
+#: ../gio/gdbusauthmechanismsha1.c:537
#, c-format
msgid "Error deleting stale lock file `%s': %s"
msgstr "删除失效的锁文件“%s”出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:568
+#: ../gio/gdbusauthmechanismsha1.c:569
#, c-format
msgid "Error creating lock file `%s': %s"
msgstr "创建锁文件“%s”出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:598
+#: ../gio/gdbusauthmechanismsha1.c:599
#, c-format
msgid "Error closing (unlinked) lock file `%s': %s"
msgstr "关闭(删除)锁文件“%s”出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:608
+#: ../gio/gdbusauthmechanismsha1.c:609
#, c-format
msgid "Error unlinking lock file `%s': %s"
msgstr "删除锁文件“%s”出错：%s"
-#: ../gio/gdbusauthmechanismsha1.c:685
+#: ../gio/gdbusauthmechanismsha1.c:686
#, c-format
msgid "Error opening keyring `%s' for writing: "
msgstr "打开钥匙环“%s”以写入出错："
-#: ../gio/gdbusauthmechanismsha1.c:882
+#: ../gio/gdbusauthmechanismsha1.c:883
#, c-format
msgid "(Additionally, releasing the lock for `%s' also failed: %s) "
msgstr "(此外，释放 %s 的锁失败：%s)"
-#: ../gio/gdbusconnection.c:594 ../gio/gdbusconnection.c:2391
+#: ../gio/gdbusconnection.c:597 ../gio/gdbusconnection.c:2440
msgid "The connection is closed"
msgstr "连接已关闭"
-#: ../gio/gdbusconnection.c:1881
+#: ../gio/gdbusconnection.c:1930
msgid "Timeout was reached"
msgstr "已到超时限制"
-#: ../gio/gdbusconnection.c:2513
+#: ../gio/gdbusconnection.c:2562
msgid ""
"Unsupported flags encountered when constructing a client-side connection"
msgstr "构建客户端连接时遇到不支持的标志"
-#: ../gio/gdbusconnection.c:4016 ../gio/gdbusconnection.c:4332
+#: ../gio/gdbusconnection.c:4065 ../gio/gdbusconnection.c:4381
#, c-format
msgid ""
"No such interface `org.freedesktop.DBus.Properties' on object at path %s"
msgstr "路径 %s 的对象上没有 org.freedesktop.DBus.Properties 接口"
-#: ../gio/gdbusconnection.c:4087
+#: ../gio/gdbusconnection.c:4136
#, c-format
msgid "Error setting property `%s': Expected type `%s' but got `%s'"
msgstr "设置属性 %s 出错：期望 %s 类型但得到 %s 类型"
-#: ../gio/gdbusconnection.c:4182
+#: ../gio/gdbusconnection.c:4231
#, c-format
msgid "No such property `%s'"
msgstr "无此属性：%s"
-#: ../gio/gdbusconnection.c:4194
+#: ../gio/gdbusconnection.c:4243
#, c-format
msgid "Property `%s' is not readable"
msgstr "属性 %s 不可读"
-#: ../gio/gdbusconnection.c:4205
+#: ../gio/gdbusconnection.c:4254
#, c-format
msgid "Property `%s' is not writable"
msgstr "属性 %s 不可写"
-#: ../gio/gdbusconnection.c:4275 ../gio/gdbusconnection.c:6149
+#: ../gio/gdbusconnection.c:4324 ../gio/gdbusconnection.c:6200
#, c-format
msgid "No such interface `%s'"
msgstr "无此接口：%s"
-#: ../gio/gdbusconnection.c:4459
+#: ../gio/gdbusconnection.c:4508
msgid "No such interface"
msgstr "无此接口"
-#: ../gio/gdbusconnection.c:4677 ../gio/gdbusconnection.c:6655
+#: ../gio/gdbusconnection.c:4726 ../gio/gdbusconnection.c:6706
#, c-format
msgid "No such interface `%s' on object at path %s"
msgstr "在路径 %s 的对象上没有 %s 接口"
-#: ../gio/gdbusconnection.c:4732
+#: ../gio/gdbusconnection.c:4781
#, c-format
msgid "No such method `%s'"
msgstr "无此方法：%s"
-#: ../gio/gdbusconnection.c:4763
+#: ../gio/gdbusconnection.c:4812
#, c-format
msgid "Type of message, `%s', does not match expected type `%s'"
msgstr "消息的类型“%s”，与预期的类型“%s”不匹配"
-#: ../gio/gdbusconnection.c:4983
+#: ../gio/gdbusconnection.c:5032
#, c-format
msgid "An object is already exported for the interface %s at %s"
msgstr "%2$s 处的接口 %1$s 已经导出了一个对象"
-#: ../gio/gdbusconnection.c:5181
+#: ../gio/gdbusconnection.c:5230
#, c-format
msgid "Method `%s' returned type `%s', but expected `%s'"
msgstr "方法“%s”返回类型“%s”，但预期的是“%s”"
-#: ../gio/gdbusconnection.c:6260
+#: ../gio/gdbusconnection.c:6311
#, c-format
msgid "Method `%s' on interface `%s' with signature `%s' does not exist"
msgstr "带有 %3$s 签名的接口 %2$s 上不存在 %1$s 方法"
-#: ../gio/gdbusconnection.c:6379
+#: ../gio/gdbusconnection.c:6430
#, c-format
msgid "A subtree is already exported for %s"
msgstr "已经为 %s 导出一个子树"
-#: ../gio/gdbusmessage.c:859
+#: ../gio/gdbusmessage.c:1271
msgid "type is INVALID"
msgstr "类型无效"
-#: ../gio/gdbusmessage.c:870
+#: ../gio/gdbusmessage.c:1282
msgid "METHOD_CALL message: PATH or MEMBER header field is missing"
msgstr "METHOD_CALL 消息：PATH 或 MEMBER 头域缺失"
-#: ../gio/gdbusmessage.c:881
+#: ../gio/gdbusmessage.c:1293
msgid "METHOD_RETURN message: REPLY_SERIAL header field is missing"
msgstr "METHOD_CALL 消息：REPLY_SERIAL 头域缺失"
-#: ../gio/gdbusmessage.c:893
+#: ../gio/gdbusmessage.c:1305
msgid "ERROR message: REPLY_SERIAL or ERROR_NAME header field is missing"
msgstr "错误消息：REPLY_SERIAL 或 ERROR_NAME 头域缺失"
-#: ../gio/gdbusmessage.c:906
+#: ../gio/gdbusmessage.c:1318
msgid "SIGNAL message: PATH, INTERFACE or MEMBER header field is missing"
msgstr "信号消息：PATH、INTERFACE 或 MEMBER 头域缺失"
-#: ../gio/gdbusmessage.c:914
+#: ../gio/gdbusmessage.c:1326
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:922
+#: ../gio/gdbusmessage.c:1334
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:998
+#: ../gio/gdbusmessage.c:1383
#, c-format
-msgid "Wanted to read %lu byte but got EOF"
-msgid_plural "Wanted to read %lu bytes but got EOF"
-msgstr[0] "期望读取 %lu 字节但得到 EOF"
+msgid "Wanted to read %lu bytes but only got %lu"
+msgid_plural "Wanted to read %lu byte but only got %lu"
+msgstr[0] "期望读取 %lu 个字节但只得到 %lu 个"
+
+#: ../gio/gdbusmessage.c:1398
+#, c-format
+msgid "Expected NUL byte after the string `%s' but found byte %d"
+msgstr "期望 %s 后为 NUL 字节但得到字节 %d"
-#: ../gio/gdbusmessage.c:1025
+#: ../gio/gdbusmessage.c:1417
#, c-format
msgid ""
"Expected valid UTF-8 string but found invalid bytes at byte offset %d "
@@ -482,22 +512,17 @@ msgstr ""
"期望得到有效的 UTF-8 字符串，但在字节偏移 %d 处(字符串长度为 %d)得到了无效的"
"字节。该点的有效 UTF-8 字符串曾是 %s。"
-#: ../gio/gdbusmessage.c:1038
-#, c-format
-msgid "Expected NUL byte after the string `%s' but found byte %d"
-msgstr "期望 %s 后为 NUL 字节但得到字节 %d"
-
-#: ../gio/gdbusmessage.c:1242
+#: ../gio/gdbusmessage.c:1619
#, c-format
msgid "Parsed value `%s' is not a valid D-Bus object path"
msgstr "已解析的值 %s 不是有效的 D-Bus 对象路径"
-#: ../gio/gdbusmessage.c:1268
+#: ../gio/gdbusmessage.c:1643
#, c-format
msgid "Parsed value `%s' is not a valid D-Bus signature"
msgstr "已解析的值 %s 不是有效的 D-Bus 签名"
-#: ../gio/gdbusmessage.c:1325
+#: ../gio/gdbusmessage.c:1698
#, c-format
msgid ""
"Encountered array of length %u byte. Maximum length is 2<<26 bytes (64 MiB)."
@@ -505,107 +530,112 @@ msgid_plural ""
"Encountered array of length %u bytes. Maximum length is 2<<26 bytes (64 MiB)."
msgstr[0] "得到长度为 %u 字节的数组，最大长度应为 2<<26 字节(64 MiB)。"
-#: ../gio/gdbusmessage.c:1483
+#: ../gio/gdbusmessage.c:1851
#, c-format
msgid "Parsed value `%s' for variant is not a valid D-Bus signature"
msgstr "已解析的衍生属性值 %s 不是有效的 D-Bus 签名"
-#: ../gio/gdbusmessage.c:1510
+#: ../gio/gdbusmessage.c:1875
#, c-format
msgid ""
"Error deserializing GVariant with type string `%s' from the D-Bus wire format"
msgstr "在以 D-Bus 线格式用类型字符串“%s”反序列化 GVariant 时发生错误"
-#: ../gio/gdbusmessage.c:1698
+#: ../gio/gdbusmessage.c:2062
#, c-format
msgid ""
"Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
"0x%02x"
msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但是发现了值 0x%02x"
-#: ../gio/gdbusmessage.c:1712
+#: ../gio/gdbusmessage.c:2075
#, c-format
msgid "Invalid major protocol version. Expected 1 but found %d"
msgstr "无效的主协议版本。期望 1，但是找到了 %d"
-#: ../gio/gdbusmessage.c:1769
+#: ../gio/gdbusmessage.c:2131
#, c-format
msgid "Signature header with signature `%s' found but message body is empty"
msgstr "头部带有 %s 签名但消息主体为空"
-#: ../gio/gdbusmessage.c:1783
+#: ../gio/gdbusmessage.c:2145
#, c-format
msgid "Parsed value `%s' is not a valid D-Bus signature (for body)"
msgstr "已解析的值 %s 不是有效的 D-Bus 签名(针对消息主体)"
-#: ../gio/gdbusmessage.c:1814
+#: ../gio/gdbusmessage.c:2175
#, 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:1824
+#: ../gio/gdbusmessage.c:2185
msgid "Cannot deserialize message: "
msgstr "无法解串消息："
-#: ../gio/gdbusmessage.c:2156
+#: ../gio/gdbusmessage.c:2506
#, c-format
msgid ""
"Error serializing GVariant with type string `%s' to the D-Bus wire format"
msgstr "在以 D-Bus 线格式用类型字符串“%s”序列化 GVariant 时发生错误"
-#: ../gio/gdbusmessage.c:2297
+#: ../gio/gdbusmessage.c:2643
#, c-format
msgid ""
"Message has %d file descriptors but the header field indicates %d file "
"descriptors"
msgstr "消息拥有 %d 个文件描述符，但是头区域指出 %d 个文件描述符"
-#: ../gio/gdbusmessage.c:2305
+#: ../gio/gdbusmessage.c:2651
msgid "Cannot serialize message: "
msgstr "无法串行消息："
-#: ../gio/gdbusmessage.c:2349
+#: ../gio/gdbusmessage.c:2695
#, c-format
msgid "Message body has signature `%s' but there is no signature header"
msgstr "消息主体有签名 %s 但头部没有签名"
-#: ../gio/gdbusmessage.c:2359
+#: ../gio/gdbusmessage.c:2705
#, 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:2375
+#: ../gio/gdbusmessage.c:2721
#, c-format
msgid "Message body is empty but signature in the header field is `(%s)'"
msgstr "消息主体为空，但头部有签名 %s"
-#: ../gio/gdbusmessage.c:2932
+#: ../gio/gdbusmessage.c:3271
#, c-format
msgid "Error return with body of type `%s'"
msgstr "返回主体类型 %s 出错"
-#: ../gio/gdbusmessage.c:2940
+#: ../gio/gdbusmessage.c:3279
msgid "Error return with empty body"
msgstr "返回空主体出错"
-#: ../gio/gdbusprivate.c:2066
+#: ../gio/gdbusprivate.c:2069
+#, c-format
+msgid "Unable to get Hardware profile: %s"
+msgstr "无法获得硬件测量信息：%s"
+
+#: ../gio/gdbusprivate.c:2114
msgid "Unable to load /var/lib/dbus/machine-id or /etc/machine-id: "
msgstr "无法加载 /var/lib/dbus/machine-id 和 /etc/machine-id："
-#: ../gio/gdbusproxy.c:1624
+#: ../gio/gdbusproxy.c:1640
#, c-format
msgid "Error calling StartServiceByName for %s: "
msgstr "为 %s 调用 StartServiceByName 出错："
-#: ../gio/gdbusproxy.c:1645
+#: ../gio/gdbusproxy.c:1663
#, c-format
msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d"
-#: ../gio/gdbusproxy.c:2745 ../gio/gdbusproxy.c:2882
+#: ../gio/gdbusproxy.c:2763 ../gio/gdbusproxy.c:2900
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"
@@ -613,34 +643,34 @@ msgstr ""
"无法调用方法；代理名称为常见的无所有者的名称，而代理使用 "
"G_DBUS_PROXY_FLAGS_DO_NOT_AUTO_START 标记构建。"
-#: ../gio/gdbusserver.c:708
+#: ../gio/gdbusserver.c:709
msgid "Abstract name space not supported"
msgstr "不支持抽象命名空间"
-#: ../gio/gdbusserver.c:795
+#: ../gio/gdbusserver.c:796
msgid "Cannot specify nonce file when creating a server"
msgstr "创建服务器时无法指定临时文件"
-#: ../gio/gdbusserver.c:872
+#: ../gio/gdbusserver.c:874
#, c-format
msgid "Error writing nonce file at `%s': %s"
msgstr "写入“%s”处的临时文件出错：%s"
-#: ../gio/gdbusserver.c:1038
+#: ../gio/gdbusserver.c:1043
#, c-format
msgid "The string `%s' is not a valid D-Bus GUID"
msgstr "字符串“%s”不是有效 D-Bus GUID"
-#: ../gio/gdbusserver.c:1078
+#: ../gio/gdbusserver.c:1083
#, c-format
msgid "Cannot listen on unsupported transport `%s'"
msgstr "无法监听不支持的传输 %s"
-#: ../gio/gdbus-tool.c:88
+#: ../gio/gdbus-tool.c:92
msgid "COMMAND"
msgstr "命令"
-#: ../gio/gdbus-tool.c:93
+#: ../gio/gdbus-tool.c:97
#, c-format
msgid ""
"Commands:\n"
@@ -660,261 +690,266 @@ msgstr ""
"\n"
"使用“%s COMMAND --help”以获得每一个命令的帮助。\n"
-#: ../gio/gdbus-tool.c:162 ../gio/gdbus-tool.c:218 ../gio/gdbus-tool.c:290
-#: ../gio/gdbus-tool.c:314 ../gio/gdbus-tool.c:691 ../gio/gdbus-tool.c:1010
-#: ../gio/gdbus-tool.c:1443
+#: ../gio/gdbus-tool.c:166 ../gio/gdbus-tool.c:222 ../gio/gdbus-tool.c:294
+#: ../gio/gdbus-tool.c:318 ../gio/gdbus-tool.c:701 ../gio/gdbus-tool.c:1020
+#: ../gio/gdbus-tool.c:1453
#, c-format
msgid "Error: %s\n"
msgstr "错误：%s\n"
-#: ../gio/gdbus-tool.c:173 ../gio/gdbus-tool.c:231 ../gio/gdbus-tool.c:1459
+#: ../gio/gdbus-tool.c:177 ../gio/gdbus-tool.c:235 ../gio/gdbus-tool.c:1469
#, c-format
msgid "Error parsing introspection XML: %s\n"
msgstr "解析 Introspection XML 时出错：%s\n"
-#: ../gio/gdbus-tool.c:348
+#: ../gio/gdbus-tool.c:352
msgid "Connect to the system bus"
msgstr "连接到系统总线"
-#: ../gio/gdbus-tool.c:349
+#: ../gio/gdbus-tool.c:353
msgid "Connect to the session bus"
msgstr "连接到会话总线"
-#: ../gio/gdbus-tool.c:350
+#: ../gio/gdbus-tool.c:354
msgid "Connect to given D-Bus address"
msgstr "连接到给定的 D-Bus 地址"
-#: ../gio/gdbus-tool.c:360
+#: ../gio/gdbus-tool.c:364
msgid "Connection Endpoint Options:"
msgstr "连接端点选项："
-#: ../gio/gdbus-tool.c:361
+#: ../gio/gdbus-tool.c:365
msgid "Options specifying the connection endpoint"
msgstr "指定连接端点的选项"
-#: ../gio/gdbus-tool.c:383
+#: ../gio/gdbus-tool.c:387
#, c-format
msgid "No connection endpoint specified"
msgstr "没有指定连接的端点"
-#: ../gio/gdbus-tool.c:393
+#: ../gio/gdbus-tool.c:397
#, c-format
msgid "Multiple connection endpoints specified"
msgstr "指定了多个连接端点"
-#: ../gio/gdbus-tool.c:463
+#: ../gio/gdbus-tool.c:467
#, c-format
msgid ""
"Warning: According to introspection data, interface `%s' does not exist\n"
msgstr "警告：根据 Introspection 数据，接口“%s”不存在\n"
-#: ../gio/gdbus-tool.c:472
+#: ../gio/gdbus-tool.c:476
#, c-format
msgid ""
"Warning: According to introspection data, method `%s' does not exist on "
"interface `%s'\n"
msgstr "警告：根据 Introspection 数据，在接口“%s”中方法“%s”不存在\n"
-#: ../gio/gdbus-tool.c:534
+#: ../gio/gdbus-tool.c:538
msgid "Optional destination for signal (unique name)"
msgstr "信号的可选目标位置(唯一名字)"
-#: ../gio/gdbus-tool.c:535
+#: ../gio/gdbus-tool.c:539
msgid "Object path to emit signal on"
msgstr "要触发信号的对象路径"
-#: ../gio/gdbus-tool.c:536
+#: ../gio/gdbus-tool.c:540
msgid "Signal and interface name"
msgstr "信号和接口名称"
-#: ../gio/gdbus-tool.c:568
+#: ../gio/gdbus-tool.c:572
msgid "Emit a signal."
msgstr "发射信号。"
-#: ../gio/gdbus-tool.c:602 ../gio/gdbus-tool.c:822 ../gio/gdbus-tool.c:1549
-#: ../gio/gdbus-tool.c:1781
+#: ../gio/gdbus-tool.c:606 ../gio/gdbus-tool.c:832 ../gio/gdbus-tool.c:1559
+#: ../gio/gdbus-tool.c:1791
#, c-format
msgid "Error connecting: %s\n"
msgstr "连接时出错：%s\n"
-#: ../gio/gdbus-tool.c:614
+#: ../gio/gdbus-tool.c:618
#, c-format
msgid "Error: object path not specified.\n"
msgstr "错误：没有指定对象路径。\n"
-#: ../gio/gdbus-tool.c:619 ../gio/gdbus-tool.c:883 ../gio/gdbus-tool.c:1607
-#: ../gio/gdbus-tool.c:1840
+#: ../gio/gdbus-tool.c:623 ../gio/gdbus-tool.c:893 ../gio/gdbus-tool.c:1617
+#: ../gio/gdbus-tool.c:1850
#, c-format
msgid "Error: %s is not a valid object path\n"
msgstr "错误：%s 不是有效的对象路径\n"
-#: ../gio/gdbus-tool.c:625
+#: ../gio/gdbus-tool.c:629
#, c-format
msgid "Error: signal not specified.\n"
msgstr "错误：没有指定对象。\n"
-#: ../gio/gdbus-tool.c:634
+#: ../gio/gdbus-tool.c:636
+#, c-format
+msgid "Error: signal must be the fully-qualified name.\n"
+msgstr "错误：信号必须是完全限定名。\n"
+
+#: ../gio/gdbus-tool.c:644
#, c-format
msgid "Error: %s is not a valid interface name\n"
msgstr "错误：%s 不是有效的接口名字。\n"
-#: ../gio/gdbus-tool.c:640
+#: ../gio/gdbus-tool.c:650
#, c-format
msgid "Error: %s is not a valid member name\n"
msgstr "错误：%s 不是有效的成员名字。\n"
-#: ../gio/gdbus-tool.c:646
+#: ../gio/gdbus-tool.c:656
#, c-format
msgid "Error: %s is not a valid unique bus name.\n"
msgstr "错误：%s 不是有效的唯一总线名。\n"
-#: ../gio/gdbus-tool.c:669 ../gio/gdbus-tool.c:982
+#: ../gio/gdbus-tool.c:679 ../gio/gdbus-tool.c:992
#, c-format
msgid "Error parsing parameter %d: %s\n"
msgstr "解析第 %d 个选项出错：%s\n"
-#: ../gio/gdbus-tool.c:698
+#: ../gio/gdbus-tool.c:708
#, c-format
msgid "Error flushing connection: %s\n"
msgstr "清空连接接时出错：%s\n"
-#: ../gio/gdbus-tool.c:725
+#: ../gio/gdbus-tool.c:735
msgid "Destination name to invoke method on"
msgstr "调用方法的目标位置名称"
-#: ../gio/gdbus-tool.c:726
+#: ../gio/gdbus-tool.c:736
msgid "Object path to invoke method on"
msgstr "调用方法的对象路径"
-#: ../gio/gdbus-tool.c:727
+#: ../gio/gdbus-tool.c:737
msgid "Method and interface name"
msgstr "方法和接口名称"
-#: ../gio/gdbus-tool.c:728
+#: ../gio/gdbus-tool.c:738
msgid "Timeout in seconds"
msgstr "超时(以秒为单位)"
-#: ../gio/gdbus-tool.c:767
+#: ../gio/gdbus-tool.c:777
msgid "Invoke a method on a remote object."
msgstr "在远程对象上调用一个方法。"
-#: ../gio/gdbus-tool.c:842 ../gio/gdbus-tool.c:1568 ../gio/gdbus-tool.c:1800
+#: ../gio/gdbus-tool.c:852 ../gio/gdbus-tool.c:1578 ../gio/gdbus-tool.c:1810
#, c-format
msgid "Error: Destination is not specified\n"
msgstr "错误：没有指定目标位置名称\n"
-#: ../gio/gdbus-tool.c:863 ../gio/gdbus-tool.c:1587
+#: ../gio/gdbus-tool.c:873 ../gio/gdbus-tool.c:1597
#, c-format
msgid "Error: Object path is not specified\n"
msgstr "错误：没有指定对象路径\n"
-#: ../gio/gdbus-tool.c:898
+#: ../gio/gdbus-tool.c:908
#, c-format
msgid "Error: Method name is not specified\n"
msgstr "错误：方法名没有指定\n"
-#: ../gio/gdbus-tool.c:909
+#: ../gio/gdbus-tool.c:919
#, c-format
msgid "Error: Method name `%s' is invalid\n"
msgstr "错误：方法名“%s”无效\n"
-#: ../gio/gdbus-tool.c:974
+#: ../gio/gdbus-tool.c:984
#, c-format
msgid "Error parsing parameter %d of type `%s': %s\n"
msgstr "解析 %2$s 类型的参数 %1$d 时发生错误：%3$s\n"
-#: ../gio/gdbus-tool.c:1406
+#: ../gio/gdbus-tool.c:1416
msgid "Destination name to introspect"
msgstr "要 Introspect 的目标位置名称"
-#: ../gio/gdbus-tool.c:1407
+#: ../gio/gdbus-tool.c:1417
msgid "Object path to introspect"
msgstr "要 Introspect 的对象路径"
-#: ../gio/gdbus-tool.c:1408
+#: ../gio/gdbus-tool.c:1418
msgid "Print XML"
msgstr "输出 XML"
-#: ../gio/gdbus-tool.c:1409
+#: ../gio/gdbus-tool.c:1419
msgid "Introspect children"
msgstr "Introspect 子对象"
-#: ../gio/gdbus-tool.c:1410
+#: ../gio/gdbus-tool.c:1420
msgid "Only print properties"
msgstr "只打印属性"
-#: ../gio/gdbus-tool.c:1501
+#: ../gio/gdbus-tool.c:1511
msgid "Introspect a remote object."
msgstr "Introspect 远程对象。"
-#: ../gio/gdbus-tool.c:1699
+#: ../gio/gdbus-tool.c:1709
msgid "Destination name to monitor"
msgstr "要监视的目标位置名称"
-#: ../gio/gdbus-tool.c:1700
+#: ../gio/gdbus-tool.c:1710
msgid "Object path to monitor"
msgstr "要监视的对象路径"
-#: ../gio/gdbus-tool.c:1733
+#: ../gio/gdbus-tool.c:1743
msgid "Monitor a remote object."
msgstr "监视一个远程对象。"
-#: ../gio/gdesktopappinfo.c:578 ../gio/gwin32appinfo.c:221
+#: ../gio/gdesktopappinfo.c:594 ../gio/gwin32appinfo.c:221
msgid "Unnamed"
msgstr "未命名"
-#: ../gio/gdesktopappinfo.c:991
+#: ../gio/gdesktopappinfo.c:1007
msgid "Desktop file didn't specify Exec field"
msgstr "桌面文件未指定 Exec 区域"
-#: ../gio/gdesktopappinfo.c:1279
+#: ../gio/gdesktopappinfo.c:1295
msgid "Unable to find terminal required for application"
msgstr "无法找到应用程序需要的终端"
-#: ../gio/gdesktopappinfo.c:1566
+#: ../gio/gdesktopappinfo.c:1597
#, c-format
msgid "Can't create user application configuration folder %s: %s"
msgstr "无法创建用户应用程序配置文件夹 %s：%s"
-#: ../gio/gdesktopappinfo.c:1570
+#: ../gio/gdesktopappinfo.c:1601
#, c-format
msgid "Can't create user MIME configuration folder %s: %s"
msgstr "无法创建用户 MIME 配置文件夹 %s：%s"
-#: ../gio/gdesktopappinfo.c:1810 ../gio/gdesktopappinfo.c:1834
+#: ../gio/gdesktopappinfo.c:1841 ../gio/gdesktopappinfo.c:1865
msgid "Application information lacks an identifier"
msgstr "应用程序信息缺少标志符。"
-#: ../gio/gdesktopappinfo.c:2058
+#: ../gio/gdesktopappinfo.c:2097
#, c-format
msgid "Can't create user desktop file %s"
msgstr "无法创建用户桌面文件 %s"
-#: ../gio/gdesktopappinfo.c:2174
+#: ../gio/gdesktopappinfo.c:2221
#, c-format
msgid "Custom definition for %s"
msgstr "%s 的自定义定义"
-#: ../gio/gdrive.c:363
+#: ../gio/gdrive.c:394
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:444
+#: ../gio/gdrive.c:472
msgid "drive doesn't implement eject or eject_with_operation"
msgstr "驱动器未实现 eject 或 eject_with_operation"
-#: ../gio/gdrive.c:521
+#: ../gio/gdrive.c:548
msgid "drive doesn't implement polling for media"
msgstr "驱动器未实现媒体轮询"
-#: ../gio/gdrive.c:728
+#: ../gio/gdrive.c:753
msgid "drive doesn't implement start"
msgstr "驱动器未实现 start"
-#: ../gio/gdrive.c:831
+#: ../gio/gdrive.c:855
msgid "drive doesn't implement stop"
msgstr "驱动器未实现 stop"
@@ -947,92 +982,106 @@ msgstr "GEmblemedIcon 编码中有不正确的符号数量(%d)"
msgid "Expected a GEmblem for GEmblemedIcon"
msgstr "GEmblemedIcon 中应为 GEmblem"
-#: ../gio/gfile.c:874 ../gio/gfile.c:1105 ../gio/gfile.c:1240
-#: ../gio/gfile.c:1477 ../gio/gfile.c:1531 ../gio/gfile.c:1588
-#: ../gio/gfile.c:1671 ../gio/gfile.c:1726 ../gio/gfile.c:1786
-#: ../gio/gfile.c:1840 ../gio/gfile.c:3312 ../gio/gfile.c:3366
-#: ../gio/gfile.c:3500 ../gio/gfile.c:3541 ../gio/gfile.c:3871
-#: ../gio/gfile.c:4273 ../gio/gfile.c:4359 ../gio/gfile.c:4448
-#: ../gio/gfile.c:4546 ../gio/gfile.c:4633 ../gio/gfile.c:4727
-#: ../gio/gfile.c:5048 ../gio/gfile.c:5315 ../gio/gfile.c:5380
-#: ../gio/gfile.c:7008 ../gio/gfile.c:7098 ../gio/gfile.c:7184
+#: ../gio/gfile.c:917 ../gio/gfile.c:1156 ../gio/gfile.c:1295
+#: ../gio/gfile.c:1535 ../gio/gfile.c:1590 ../gio/gfile.c:1648
+#: ../gio/gfile.c:1732 ../gio/gfile.c:1789 ../gio/gfile.c:1853
+#: ../gio/gfile.c:1908 ../gio/gfile.c:3468 ../gio/gfile.c:3523
+#: ../gio/gfile.c:3669 ../gio/gfile.c:3711 ../gio/gfile.c:4113
+#: ../gio/gfile.c:4525 ../gio/gfile.c:4610 ../gio/gfile.c:4700
+#: ../gio/gfile.c:4797 ../gio/gfile.c:4884 ../gio/gfile.c:4985
+#: ../gio/gfile.c:5258 ../gio/gfile.c:5536 ../gio/gfile.c:5590
+#: ../gio/gfile.c:7135 ../gio/gfile.c:7225 ../gio/gfile.c:7309
#: ../gio/win32/gwinhttpfile.c:439
msgid "Operation not supported"
msgstr "不支持该操作"
-#. Translators: This is an error message when trying to find the
-#. * enclosing (user visible) mount of a file, but none exists.
+#. Translators: This is an error message when
+#. * trying to find the enclosing (user visible)
+#. * mount of a file, but none exists.
+#.
#. Translators: This is an error message when trying to
#. * find the enclosing (user visible) mount of a file, but
#. * none exists.
#. Translators: This is an error message when trying to find
#. * the enclosing (user visible) mount of a file, but none
#. * exists.
-#: ../gio/gfile.c:1361 ../gio/glocalfile.c:1070 ../gio/glocalfile.c:1081
-#: ../gio/glocalfile.c:1094
+#: ../gio/gfile.c:1419 ../gio/glocalfile.c:1096 ../gio/glocalfile.c:1107
+#: ../gio/glocalfile.c:1120
msgid "Containing mount does not exist"
msgstr "包含的挂载不存在"
-#: ../gio/gfile.c:2414 ../gio/glocalfile.c:2289
+#: ../gio/gfile.c:2474 ../gio/glocalfile.c:2328
msgid "Can't copy over directory"
msgstr "无法跨目录复制"
-#: ../gio/gfile.c:2475
+#: ../gio/gfile.c:2534
msgid "Can't copy directory over directory"
msgstr "无法跨目录复制到目录"
-#: ../gio/gfile.c:2483 ../gio/glocalfile.c:2298
+#: ../gio/gfile.c:2542 ../gio/glocalfile.c:2337
msgid "Target file exists"
msgstr "目标文件已存在"
-#: ../gio/gfile.c:2501
+#: ../gio/gfile.c:2561
msgid "Can't recursively copy directory"
msgstr "无法递归复制目录"
-#: ../gio/gfile.c:2761
+#: ../gio/gfile.c:2825
msgid "Splice not supported"
msgstr "不支持拼接"
-#: ../gio/gfile.c:2765
+#: ../gio/gfile.c:2829
#, c-format
msgid "Error splicing file: %s"
msgstr "拼接文件出错：%s"
-#: ../gio/gfile.c:2912
+#: ../gio/gfile.c:2960
+msgid "Copy (reflink/clone) between mounts is not supported"
+msgstr "不支持在挂载之间复制(链接/克隆)"
+
+#: ../gio/gfile.c:2964
+msgid "Copy (reflink/clone) is not supported or invalid"
+msgstr "不支持复制(链接/克隆)操作或操作非法"
+
+#: ../gio/gfile.c:2969
+msgid "Copy (reflink/clone) is not supported or didn't work"
+msgstr "不支持复制(链接/克隆)操作或者不工作"
+
+#: ../gio/gfile.c:3029
msgid "Can't copy special file"
msgstr "无法复制特殊文件"
-#: ../gio/gfile.c:3490
+#: ../gio/gfile.c:3659
msgid "Invalid symlink value given"
msgstr "给出的符号链接值无效"
-#: ../gio/gfile.c:3584
+#: ../gio/gfile.c:3819
msgid "Trash not supported"
msgstr "不支持回收站"
-#: ../gio/gfile.c:3633
+#: ../gio/gfile.c:3870
#, c-format
msgid "File names cannot contain '%c'"
msgstr "文件名不能包含“%c”"
-#: ../gio/gfile.c:6067 ../gio/gvolume.c:332
+#: ../gio/gfile.c:6258 ../gio/gvolume.c:365
msgid "volume doesn't implement mount"
msgstr "卷未实现挂载"
-#: ../gio/gfile.c:6178
+#: ../gio/gfile.c:6367
msgid "No application is registered as handling this file"
msgstr "没有为此类型文件注册相应的处理程序"
-#: ../gio/gfileenumerator.c:205
+#: ../gio/gfileenumerator.c:204
msgid "Enumerator is closed"
msgstr "枚举器已关闭"
-#: ../gio/gfileenumerator.c:212 ../gio/gfileenumerator.c:271
-#: ../gio/gfileenumerator.c:371 ../gio/gfileenumerator.c:480
+#: ../gio/gfileenumerator.c:211 ../gio/gfileenumerator.c:270
+#: ../gio/gfileenumerator.c:367 ../gio/gfileenumerator.c:467
msgid "File enumerator has outstanding operation"
msgstr "文件枚举器有异常操作"
-#: ../gio/gfileenumerator.c:361 ../gio/gfileenumerator.c:470
+#: ../gio/gfileenumerator.c:358 ../gio/gfileenumerator.c:458
msgid "File enumerator is already closed"
msgstr "文件枚举器已关闭"
@@ -1045,22 +1094,22 @@ msgstr "无法处理 GFileIcon 编码的版本 %d"
msgid "Malformed input data for GFileIcon"
msgstr "GFileIcon 有不正确的输入数据"
-#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:420
+#: ../gio/gfileinputstream.c:154 ../gio/gfileinputstream.c:400
#: ../gio/gfileiostream.c:170 ../gio/gfileoutputstream.c:169
-#: ../gio/gfileoutputstream.c:523
+#: ../gio/gfileoutputstream.c:503
msgid "Stream doesn't support query_info"
msgstr "流不支持 query_info"
-#: ../gio/gfileinputstream.c:335 ../gio/gfileiostream.c:387
-#: ../gio/gfileoutputstream.c:381
+#: ../gio/gfileinputstream.c:331 ../gio/gfileiostream.c:383
+#: ../gio/gfileoutputstream.c:377
msgid "Seek not supported on stream"
-msgstr "流不支持查找"
+msgstr "流不支持定位(seek)"
-#: ../gio/gfileinputstream.c:379
+#: ../gio/gfileinputstream.c:375
msgid "Truncate not allowed on input stream"
msgstr "输入流不允许截断"
-#: ../gio/gfileiostream.c:463 ../gio/gfileoutputstream.c:457
+#: ../gio/gfileiostream.c:459 ../gio/gfileoutputstream.c:453
msgid "Truncate not supported on stream"
msgstr "流不支持截断"
@@ -1094,8 +1143,8 @@ msgstr "不正确的版本号：%s"
msgid "Type %s does not implement from_tokens() on the GIcon interface"
msgstr "类型 %s 没有实现 GIcon 接口的 from_tokens() 方法"
-#: ../gio/gicon.c:430
-msgid "Can't handle the supplied version the icon encoding"
+#: ../gio/gicon.c:428
+msgid "Can't handle the supplied version of the icon encoding"
msgstr "无法处理提供的图标编码版本"
#: ../gio/ginetaddressmask.c:184
@@ -1135,115 +1184,129 @@ msgstr "输入流未实现读取"
#. Translators: This is an error you get if there is
#. * already an operation running against this stream when
#. * you try to start one
-#: ../gio/ginputstream.c:898 ../gio/giostream.c:302
-#: ../gio/goutputstream.c:1238
+#: ../gio/ginputstream.c:1033 ../gio/giostream.c:301
+#: ../gio/goutputstream.c:1344
msgid "Stream has outstanding operation"
msgstr "流有异常操作"
-#: ../gio/glib-compile-resources.c:144 ../gio/glib-compile-schemas.c:1455
+#: ../gio/glib-compile-resources.c:145 ../gio/glib-compile-schemas.c:1459
#, c-format
msgid "Element <%s> not allowed inside <%s>"
msgstr "在 <%2$s> 中不允许元素 <%1$s>"
-#: ../gio/glib-compile-resources.c:148 ../gio/glib-compile-schemas.c:1459
+#: ../gio/glib-compile-resources.c:149
#, c-format
msgid "Element <%s> not allowed at toplevel"
msgstr "顶层中不允许元素 <%s>"
-#: ../gio/glib-compile-resources.c:238
+#: ../gio/glib-compile-resources.c:239
#, c-format
msgid "File %s appears multiple times in the resource"
msgstr "文件 %s 在资源中出现了多次"
-#: ../gio/glib-compile-resources.c:251
+#: ../gio/glib-compile-resources.c:252
#, c-format
msgid "Failed to locate '%s' in any source directory"
msgstr "在所有源目录中定位“%s”失败"
-#: ../gio/glib-compile-resources.c:262
+#: ../gio/glib-compile-resources.c:263
#, c-format
msgid "Failed to locate '%s' in current directory"
msgstr "在当前目录定位“%s”失败"
-#: ../gio/glib-compile-resources.c:290
+#: ../gio/glib-compile-resources.c:291
#, c-format
msgid "Unknown processing option \"%s\""
msgstr "未知的处理选项“%s”"
-#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:366
+#: ../gio/glib-compile-resources.c:310 ../gio/glib-compile-resources.c:370
#, c-format
msgid "Failed to create temp file: %s"
msgstr "创建临时文件失败：%s"
-#: ../gio/glib-compile-resources.c:338
-msgid "Error processing input file with xmllint"
-msgstr "用 xmllint 处理输入文件出错"
+#: ../gio/glib-compile-resources.c:340
+#, c-format
+msgid ""
+"Error processing input file with xmllint:\n"
+"%s"
+msgstr ""
+"用 xmllint 处理输入文件出错：\n"
+"%s"
-#: ../gio/glib-compile-resources.c:393
-msgid "Error processing input file with to-pixdata"
-msgstr "用 to-pixdata 处理输入文件出错"
+#: ../gio/glib-compile-resources.c:396
+#, c-format
+msgid ""
+"Error processing input file with to-pixdata:\n"
+"%s"
+msgstr ""
+"用 to-pixdata 处理输入文件出错：\n"
+"%s"
-#: ../gio/glib-compile-resources.c:406
+#: ../gio/glib-compile-resources.c:410
#, c-format
msgid "Error reading file %s: %s"
msgstr "读取文件 %s 出错：%s"
-#: ../gio/glib-compile-resources.c:426
+#: ../gio/glib-compile-resources.c:430
#, c-format
msgid "Error compressing file %s"
msgstr "压缩文件时出错：%s"
-#: ../gio/glib-compile-resources.c:490 ../gio/glib-compile-schemas.c:1567
+#: ../gio/glib-compile-resources.c:494 ../gio/glib-compile-schemas.c:1571
#, c-format
msgid "text may not appear inside <%s>"
msgstr "<%s> 内不应出现文本"
-#: ../gio/glib-compile-resources.c:613
+#: ../gio/glib-compile-resources.c:619
msgid "name of the output file"
msgstr "输出文件名"
-#: ../gio/glib-compile-resources.c:613 ../gio/glib-compile-resources.c:646
-#: ../gio/gresource-tool.c:477 ../gio/gresource-tool.c:543
+#: ../gio/glib-compile-resources.c:619 ../gio/glib-compile-resources.c:650
+#: ../gio/gresource-tool.c:482 ../gio/gresource-tool.c:548
msgid "FILE"
msgstr "FILE"
-#: ../gio/glib-compile-resources.c:614
+#: ../gio/glib-compile-resources.c:620
msgid ""
"The directories where files are to be read from (default to current "
"directory)"
msgstr "文件会被读出的目录(默认为当前目录)"
-#: ../gio/glib-compile-resources.c:614 ../gio/glib-compile-schemas.c:1995
-#: ../gio/glib-compile-schemas.c:2025
+#: ../gio/glib-compile-resources.c:620 ../gio/glib-compile-schemas.c:1999
+#: ../gio/glib-compile-schemas.c:2028
msgid "DIRECTORY"
msgstr "DIRECTORY"
-#: ../gio/glib-compile-resources.c:615
+#: ../gio/glib-compile-resources.c:621
msgid ""
"Generate output in the format selected for by the target filename extension"
msgstr "以目标文件扩展名所选择的格式生成输出"
-#: ../gio/glib-compile-resources.c:616
+#: ../gio/glib-compile-resources.c:622
msgid "Generate source header"
msgstr "生成源码头文件"
-#: ../gio/glib-compile-resources.c:617
+#: ../gio/glib-compile-resources.c:623
msgid "Generate sourcecode used to link in the resource file into your code"
msgstr "生成用于将资源文件链接到您的代码的源代码"
-#: ../gio/glib-compile-resources.c:618
+#: ../gio/glib-compile-resources.c:624
msgid "Generate dependency list"
msgstr "生成依赖关系列表"
-#: ../gio/glib-compile-resources.c:619
+#: ../gio/glib-compile-resources.c:625
msgid "Don't automatically create and register resource"
msgstr "不要自动创建和注册资源"
-#: ../gio/glib-compile-resources.c:620
+#: ../gio/glib-compile-resources.c:626
+msgid "Don't export functions; declare them G_GNUC_INTERNAL"
+msgstr "不要导出函数；请将它们声明为 G_GNUC_INTERNAL"
+
+#: ../gio/glib-compile-resources.c:627
msgid "C identifier name used for the generated source code"
msgstr "用于生成的源代码的 C 标识符名称"
-#: ../gio/glib-compile-resources.c:649
+#: ../gio/glib-compile-resources.c:653
msgid ""
"Compile a resource specification into a resource file.\n"
"Resource specification files have the extension .gresource.xml,\n"
@@ -1253,57 +1316,57 @@ msgstr ""
"资源规格文件以 .gresource.xml 为扩展名，\n"
"资源文件以 .gresource 为扩展名。"
-#: ../gio/glib-compile-resources.c:665
+#: ../gio/glib-compile-resources.c:669
#, c-format
msgid "You should give exactly one file name\n"
msgstr "您应该给出惟一的文件名\n"
-#: ../gio/glib-compile-schemas.c:774
+#: ../gio/glib-compile-schemas.c:778
msgid "empty names are not permitted"
msgstr "不允许空名称"
-#: ../gio/glib-compile-schemas.c:784
+#: ../gio/glib-compile-schemas.c:788
#, c-format
msgid "invalid name '%s': names must begin with a lowercase letter"
msgstr "无效名称 %s：名称必须以小写字母开始"
-#: ../gio/glib-compile-schemas.c:796
+#: ../gio/glib-compile-schemas.c:800
#, c-format
msgid ""
"invalid name '%s': invalid character '%c'; only lowercase letters, numbers "
-"and dash ('-') are permitted."
-msgstr "无效名称 %s：无效的字符 %c，仅小写字母、数字和横线(“-”)可以使用。"
+"and hyphen ('-') are permitted."
+msgstr "无效名称 %s：无效的字符 %c，仅允许使用小写字母、数字和边字符(“-”)。"
-#: ../gio/glib-compile-schemas.c:805
+#: ../gio/glib-compile-schemas.c:809
#, c-format
-msgid "invalid name '%s': two successive dashes ('--') are not permitted."
-msgstr "无效名称 %s：不允许使用连续的横行(“--”)。"
+msgid "invalid name '%s': two successive hyphens ('--') are not permitted."
+msgstr "无效名称 %s：不允许使用连续的连字符(“--”)。"
-#: ../gio/glib-compile-schemas.c:814
+#: ../gio/glib-compile-schemas.c:818
#, c-format
-msgid "invalid name '%s': the last character may not be a dash ('-')."
-msgstr "无效名称 %s：最后一个字符串不应为横线(“-”)。"
+msgid "invalid name '%s': the last character may not be a hyphen ('-')."
+msgstr "无效名称 %s：最后一个字符串不应为连字符(“-”)。"
-#: ../gio/glib-compile-schemas.c:822
+#: ../gio/glib-compile-schemas.c:826
#, c-format
msgid "invalid name '%s': maximum length is 1024"
msgstr "无效名称 %s：最大长度为 1024"
-#: ../gio/glib-compile-schemas.c:891
+#: ../gio/glib-compile-schemas.c:895
#, c-format
msgid "<child name='%s'> already specified"
msgstr "<child name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:917
+#: ../gio/glib-compile-schemas.c:921
msgid "cannot add keys to a 'list-of' schema"
msgstr "无法添加键到一个 list-of 方案"
-#: ../gio/glib-compile-schemas.c:928
+#: ../gio/glib-compile-schemas.c:932
#, c-format
msgid "<key name='%s'> already specified"
msgstr "<key name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:946
+#: ../gio/glib-compile-schemas.c:950
#, c-format
msgid ""
"<key name='%s'> shadows <key name='%s'> in <schema id='%s'>; use <override> "
@@ -1312,69 +1375,69 @@ msgstr ""
"<key name='%s'> 与 <key name='%s'> 在 <schema id='%s'> 重合; 请使用 "
"<override> 修改其值。"
-#: ../gio/glib-compile-schemas.c:957
+#: ../gio/glib-compile-schemas.c:961
#, c-format
msgid ""
"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:976
+#: ../gio/glib-compile-schemas.c:980
#, c-format
msgid "<%s id='%s'> not (yet) defined."
msgstr "<%s id='%s'> 尚未定义。"
-#: ../gio/glib-compile-schemas.c:991
+#: ../gio/glib-compile-schemas.c:995
#, c-format
msgid "invalid GVariant type string '%s'"
msgstr "无效的 GVariant 类型字符串 %s"
-#: ../gio/glib-compile-schemas.c:1021
+#: ../gio/glib-compile-schemas.c:1025
msgid "<override> given but schema isn't extending anything"
msgstr "给出了 <override> 但方案并未扩展"
-#: ../gio/glib-compile-schemas.c:1034
+#: ../gio/glib-compile-schemas.c:1038
#, c-format
msgid "no <key name='%s'> to override"
msgstr "无 <key name='%s'> 可覆盖"
-#: ../gio/glib-compile-schemas.c:1042
+#: ../gio/glib-compile-schemas.c:1046
#, c-format
msgid "<override name='%s'> already specified"
msgstr "<override name='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:1113
+#: ../gio/glib-compile-schemas.c:1117
#, c-format
msgid "<schema id='%s'> already specified"
msgstr "<schema id='%s'> 已指定"
-#: ../gio/glib-compile-schemas.c:1125
+#: ../gio/glib-compile-schemas.c:1129
#, 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:1141
+#: ../gio/glib-compile-schemas.c:1145
#, 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:1149
+#: ../gio/glib-compile-schemas.c:1153
#, c-format
msgid "Can not be a list of a schema with a path"
msgstr "不能是一系列带有路径的方案"
-#: ../gio/glib-compile-schemas.c:1159
+#: ../gio/glib-compile-schemas.c:1163
#, c-format
msgid "Can not extend a schema with a path"
msgstr "无法使用路径扩展方案"
-#: ../gio/glib-compile-schemas.c:1169
+#: ../gio/glib-compile-schemas.c:1173
#, 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:1179
+#: ../gio/glib-compile-schemas.c:1183
#, c-format
msgid ""
"<schema id='%s' list-of='%s'> extends <schema id='%s' list-of='%s'> but '%s' "
@@ -1383,98 +1446,102 @@ msgstr ""
"<schema id='%s' list-of='%s'> 扩展 <schema id='%s' list-of='%s'>，但“%s”不扩"
"展 %s"
-#: ../gio/glib-compile-schemas.c:1196
+#: ../gio/glib-compile-schemas.c:1200
#, c-format
msgid "a path, if given, must begin and end with a slash"
msgstr "一个路径，如果给出则必须以斜线(/)开始和结束"
-#: ../gio/glib-compile-schemas.c:1203
+#: ../gio/glib-compile-schemas.c:1207
#, c-format
msgid "the path of a list must end with ':/'"
msgstr "一个列表的路径必须以 :/ 结束"
-#: ../gio/glib-compile-schemas.c:1235
+#: ../gio/glib-compile-schemas.c:1239
#, c-format
msgid "<%s id='%s'> already specified"
msgstr "<%s id='%s'> 已指定"
+#: ../gio/glib-compile-schemas.c:1463
+#, c-format
+msgid "Element <%s> not allowed at the top level"
+msgstr "顶层中不允许元素 <%s>"
+
#. Translators: Do not translate "--strict".
-#: ../gio/glib-compile-schemas.c:1753 ../gio/glib-compile-schemas.c:1824
-#: ../gio/glib-compile-schemas.c:1900
+#: ../gio/glib-compile-schemas.c:1757 ../gio/glib-compile-schemas.c:1828
+#: ../gio/glib-compile-schemas.c:1904
#, c-format
msgid "--strict was specified; exiting.\n"
msgstr "指定了 --strict；退出。\n"
-#: ../gio/glib-compile-schemas.c:1761
+#: ../gio/glib-compile-schemas.c:1765
#, c-format
msgid "This entire file has been ignored.\n"
msgstr "整个文件被忽略。\n"
-#: ../gio/glib-compile-schemas.c:1820
+#: ../gio/glib-compile-schemas.c:1824
#, c-format
msgid "Ignoring this file.\n"
msgstr "忽略此文件。\n"
-#: ../gio/glib-compile-schemas.c:1860
+#: ../gio/glib-compile-schemas.c:1864
#, 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:1866 ../gio/glib-compile-schemas.c:1924
-#: ../gio/glib-compile-schemas.c:1952
+#: ../gio/glib-compile-schemas.c:1870 ../gio/glib-compile-schemas.c:1928
+#: ../gio/glib-compile-schemas.c:1956
#, c-format
msgid "; ignoring override for this key.\n"
msgstr "；忽略对此键的覆盖。\n"
-#: ../gio/glib-compile-schemas.c:1870 ../gio/glib-compile-schemas.c:1928
-#: ../gio/glib-compile-schemas.c:1956
+#: ../gio/glib-compile-schemas.c:1874 ../gio/glib-compile-schemas.c:1932
+#: ../gio/glib-compile-schemas.c:1960
#, c-format
msgid " and --strict was specified; exiting.\n"
msgstr "并且指定了 --strict；退出。\n"
-#: ../gio/glib-compile-schemas.c:1886
+#: ../gio/glib-compile-schemas.c:1890
#, 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。"
+"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:1896
+#: ../gio/glib-compile-schemas.c:1900
#, c-format
msgid "Ignoring override for this key.\n"
msgstr "忽略对此键的覆盖。\n"
-#: ../gio/glib-compile-schemas.c:1914
+#: ../gio/glib-compile-schemas.c:1918
#, c-format
msgid ""
-"override for key `%s' in schema `%s' in override file `%s' is out of the "
+"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:1942
+#: ../gio/glib-compile-schemas.c:1946
#, 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:1995
+#: ../gio/glib-compile-schemas.c:1999
msgid "where to store the gschemas.compiled file"
msgstr "gschemas.compiled 文件存储于何处"
-#: ../gio/glib-compile-schemas.c:1996
+#: ../gio/glib-compile-schemas.c:2000
msgid "Abort on any errors in schemas"
msgstr "在方案出现任何错误时中止"
-#: ../gio/glib-compile-schemas.c:1997
+#: ../gio/glib-compile-schemas.c:2001
msgid "Do not write the gschema.compiled file"
msgstr "不要对 gschema.compiled 进行写操作"
-#: ../gio/glib-compile-schemas.c:1998
+#: ../gio/glib-compile-schemas.c:2002
msgid "Do not enforce key name restrictions"
msgstr "不要强制键名的限制"
-#: ../gio/glib-compile-schemas.c:2028
+#: ../gio/glib-compile-schemas.c:2031
msgid ""
"Compile all GSettings schema files into a schema cache.\n"
"Schema files are required to have the extension .gschema.xml,\n"
@@ -1484,415 +1551,415 @@ msgstr ""
"要使用扩展 .gschema.xml，需要有方案文件，\n"
"缓存文件被称为 gschemas.compiled。"
-#: ../gio/glib-compile-schemas.c:2044
+#: ../gio/glib-compile-schemas.c:2047
#, c-format
msgid "You should give exactly one directory name\n"
msgstr "您应该给出且只能给出一个目录名\n"
-#: ../gio/glib-compile-schemas.c:2083
+#: ../gio/glib-compile-schemas.c:2086
#, c-format
msgid "No schema files found: "
msgstr "没有找到方案文件："
-#: ../gio/glib-compile-schemas.c:2086
+#: ../gio/glib-compile-schemas.c:2089
#, c-format
msgid "doing nothing.\n"
msgstr "什么都没做。\n"
-#: ../gio/glib-compile-schemas.c:2089
+#: ../gio/glib-compile-schemas.c:2092
#, c-format
msgid "removed existing output file.\n"
msgstr "已删除存在的输出文件。\n"
-#: ../gio/glocaldirectorymonitor.c:287
+#: ../gio/glocaldirectorymonitor.c:252
msgid "Unable to find default local directory monitor type"
msgstr "无法找到默认的本地目录监视器类型"
-#: ../gio/glocalfile.c:571 ../gio/win32/gwinhttpfile.c:422
+#: ../gio/glocalfile.c:597 ../gio/win32/gwinhttpfile.c:422
#, c-format
msgid "Invalid filename %s"
msgstr "无效的文件名 %s"
-#: ../gio/glocalfile.c:948
+#: ../gio/glocalfile.c:974
#, c-format
msgid "Error getting filesystem info: %s"
msgstr "读取文件系统信息时出错：%s"
-#: ../gio/glocalfile.c:1116
+#: ../gio/glocalfile.c:1142
msgid "Can't rename root directory"
msgstr "无法重命名根目录"
-#: ../gio/glocalfile.c:1136 ../gio/glocalfile.c:1162
+#: ../gio/glocalfile.c:1162 ../gio/glocalfile.c:1188
#, c-format
msgid "Error renaming file: %s"
msgstr "重命名文件时出错：%s"
-#: ../gio/glocalfile.c:1145
+#: ../gio/glocalfile.c:1171
msgid "Can't rename file, filename already exists"
msgstr "无法重命名文件，该文件名已存在"
-#: ../gio/glocalfile.c:1158 ../gio/glocalfile.c:2162 ../gio/glocalfile.c:2191
-#: ../gio/glocalfile.c:2351 ../gio/glocalfileoutputstream.c:581
-#: ../gio/glocalfileoutputstream.c:634 ../gio/glocalfileoutputstream.c:679
-#: ../gio/glocalfileoutputstream.c:1167
+#: ../gio/glocalfile.c:1184 ../gio/glocalfile.c:2201 ../gio/glocalfile.c:2230
+#: ../gio/glocalfile.c:2390 ../gio/glocalfileoutputstream.c:575
+#: ../gio/glocalfileoutputstream.c:628 ../gio/glocalfileoutputstream.c:673
+#: ../gio/glocalfileoutputstream.c:1161
msgid "Invalid filename"
msgstr "无效的文件名"
-#: ../gio/glocalfile.c:1325 ../gio/glocalfile.c:1349
+#: ../gio/glocalfile.c:1351 ../gio/glocalfile.c:1375
msgid "Can't open directory"
msgstr "无法打开目录"
-#: ../gio/glocalfile.c:1333
+#: ../gio/glocalfile.c:1359
#, c-format
msgid "Error opening file: %s"
msgstr "打开文件时出错：%s"
-#: ../gio/glocalfile.c:1474
+#: ../gio/glocalfile.c:1500
#, c-format
msgid "Error removing file: %s"
msgstr "删除文件时出错：%s"
-#: ../gio/glocalfile.c:1841
+#: ../gio/glocalfile.c:1880
#, c-format
msgid "Error trashing file: %s"
msgstr "将文件放到回收站时出错：%s"
-#: ../gio/glocalfile.c:1864
+#: ../gio/glocalfile.c:1903
#, c-format
msgid "Unable to create trash dir %s: %s"
msgstr "无法创建回收站目录 %s：%s"
-#: ../gio/glocalfile.c:1885
+#: ../gio/glocalfile.c:1924
msgid "Unable to find toplevel directory for trash"
msgstr "找不到回收站的顶级目录"
-#: ../gio/glocalfile.c:1964 ../gio/glocalfile.c:1984
+#: ../gio/glocalfile.c:2003 ../gio/glocalfile.c:2023
msgid "Unable to find or create trash directory"
msgstr "无法找到或创建回收站目录"
-#: ../gio/glocalfile.c:2018
+#: ../gio/glocalfile.c:2057
#, c-format
msgid "Unable to create trashing info file: %s"
msgstr "创建回收站信息文件失败：%s"
-#: ../gio/glocalfile.c:2047 ../gio/glocalfile.c:2052 ../gio/glocalfile.c:2132
-#: ../gio/glocalfile.c:2139
+#: ../gio/glocalfile.c:2086 ../gio/glocalfile.c:2091 ../gio/glocalfile.c:2171
+#: ../gio/glocalfile.c:2178
#, c-format
msgid "Unable to trash file: %s"
msgstr "无法将文件移动到回收站：%s"
-#: ../gio/glocalfile.c:2140 ../glib/gregex.c:213
+#: ../gio/glocalfile.c:2179 ../glib/gregex.c:280
msgid "internal error"
msgstr "内部错误"
-#: ../gio/glocalfile.c:2166
+#: ../gio/glocalfile.c:2205
#, c-format
msgid "Error creating directory: %s"
msgstr "创建目录时出错：%s"
-#: ../gio/glocalfile.c:2195
+#: ../gio/glocalfile.c:2234
#, c-format
msgid "Filesystem does not support symbolic links"
msgstr "文件系统不支持符号链接"
-#: ../gio/glocalfile.c:2199
+#: ../gio/glocalfile.c:2238
#, c-format
msgid "Error making symbolic link: %s"
msgstr "创建符号链接时出错：%s"
-#: ../gio/glocalfile.c:2261 ../gio/glocalfile.c:2355
+#: ../gio/glocalfile.c:2300 ../gio/glocalfile.c:2394
#, c-format
msgid "Error moving file: %s"
msgstr "移动文件时出错：%s"
-#: ../gio/glocalfile.c:2284
+#: ../gio/glocalfile.c:2323
msgid "Can't move directory over directory"
msgstr "无法将目录移动到目录"
-#: ../gio/glocalfile.c:2311 ../gio/glocalfileoutputstream.c:965
-#: ../gio/glocalfileoutputstream.c:979 ../gio/glocalfileoutputstream.c:994
-#: ../gio/glocalfileoutputstream.c:1010 ../gio/glocalfileoutputstream.c:1024
+#: ../gio/glocalfile.c:2350 ../gio/glocalfileoutputstream.c:959
+#: ../gio/glocalfileoutputstream.c:973 ../gio/glocalfileoutputstream.c:988
+#: ../gio/glocalfileoutputstream.c:1004 ../gio/glocalfileoutputstream.c:1018
msgid "Backup file creation failed"
msgstr "备份文件创建失败"
-#: ../gio/glocalfile.c:2330
+#: ../gio/glocalfile.c:2369
#, c-format
msgid "Error removing target file: %s"
msgstr "移除目标文件出错：%s"
-#: ../gio/glocalfile.c:2344
+#: ../gio/glocalfile.c:2383
msgid "Move between mounts not supported"
msgstr "不支持在挂载之间移动"
-#: ../gio/glocalfileinfo.c:719
+#: ../gio/glocalfileinfo.c:722
msgid "Attribute value must be non-NULL"
msgstr "属性值必须为非空"
-#: ../gio/glocalfileinfo.c:726
+#: ../gio/glocalfileinfo.c:729
msgid "Invalid attribute type (string expected)"
msgstr "无效的属性类型(应为 string)"
-#: ../gio/glocalfileinfo.c:733
+#: ../gio/glocalfileinfo.c:736
msgid "Invalid extended attribute name"
msgstr "无效的扩展属性名"
-#: ../gio/glocalfileinfo.c:773
+#: ../gio/glocalfileinfo.c:776
#, c-format
msgid "Error setting extended attribute '%s': %s"
msgstr "设置扩展属性“%s”出错：%s"
-#: ../gio/glocalfileinfo.c:1426
+#: ../gio/glocalfileinfo.c:1548
msgid " (invalid encoding)"
msgstr " (无效的编码)"
-#: ../gio/glocalfileinfo.c:1527 ../gio/glocalfileoutputstream.c:843
+#: ../gio/glocalfileinfo.c:1740 ../gio/glocalfileoutputstream.c:837
#, c-format
msgid "Error when getting information for file '%s': %s"
msgstr "获取文件“%s”的信息出错：%s"
-#: ../gio/glocalfileinfo.c:1779
+#: ../gio/glocalfileinfo.c:1986
#, c-format
msgid "Error when getting information for file descriptor: %s"
msgstr "获取文件描述符的信息时出错：%s"
-#: ../gio/glocalfileinfo.c:1824
+#: ../gio/glocalfileinfo.c:2031
msgid "Invalid attribute type (uint32 expected)"
msgstr "无效的属性类型(应为 uint32)"
-#: ../gio/glocalfileinfo.c:1842
+#: ../gio/glocalfileinfo.c:2049
msgid "Invalid attribute type (uint64 expected)"
msgstr "无效的属性类型(应为 uint64)"
-#: ../gio/glocalfileinfo.c:1861 ../gio/glocalfileinfo.c:1880
+#: ../gio/glocalfileinfo.c:2068 ../gio/glocalfileinfo.c:2087
msgid "Invalid attribute type (byte string expected)"
msgstr "无效的属性类型(应为 byte string)"
-#: ../gio/glocalfileinfo.c:1915
+#: ../gio/glocalfileinfo.c:2122
msgid "Cannot set permissions on symlinks"
msgstr "无法为符号链设置权限"
-#: ../gio/glocalfileinfo.c:1931
+#: ../gio/glocalfileinfo.c:2138
#, c-format
msgid "Error setting permissions: %s"
msgstr "设置访问权限出错：%s"
-#: ../gio/glocalfileinfo.c:1982
+#: ../gio/glocalfileinfo.c:2189
#, c-format
msgid "Error setting owner: %s"
msgstr "设置所有者出错：%s"
-#: ../gio/glocalfileinfo.c:2005
+#: ../gio/glocalfileinfo.c:2212
msgid "symlink must be non-NULL"
msgstr "符号链接必须是非空"
-#: ../gio/glocalfileinfo.c:2015 ../gio/glocalfileinfo.c:2034
-#: ../gio/glocalfileinfo.c:2045
+#: ../gio/glocalfileinfo.c:2222 ../gio/glocalfileinfo.c:2241
+#: ../gio/glocalfileinfo.c:2252
#, c-format
msgid "Error setting symlink: %s"
msgstr "设置符号链接出错：%s"
-#: ../gio/glocalfileinfo.c:2024
+#: ../gio/glocalfileinfo.c:2231
msgid "Error setting symlink: file is not a symlink"
msgstr "设定符号链接出错：文件不是符号链接"
-#: ../gio/glocalfileinfo.c:2150
+#: ../gio/glocalfileinfo.c:2357
#, c-format
msgid "Error setting modification or access time: %s"
msgstr "错误设置修改或访问时间：%s"
-#: ../gio/glocalfileinfo.c:2173
+#: ../gio/glocalfileinfo.c:2380
msgid "SELinux context must be non-NULL"
msgstr "SELinux 上下文必须是非空"
-#: ../gio/glocalfileinfo.c:2188
+#: ../gio/glocalfileinfo.c:2395
#, c-format
msgid "Error setting SELinux context: %s"
msgstr "设置 SELinux 上下文出错：%s"
-#: ../gio/glocalfileinfo.c:2195
+#: ../gio/glocalfileinfo.c:2402
msgid "SELinux is not enabled on this system"
msgstr "此系统尚未启用 SELinux"
-#: ../gio/glocalfileinfo.c:2287
+#: ../gio/glocalfileinfo.c:2494
#, c-format
msgid "Setting attribute %s not supported"
msgstr "不支持设置属性 %s"
-#: ../gio/glocalfileinputstream.c:185 ../gio/glocalfileoutputstream.c:732
+#: ../gio/glocalfileinputstream.c:186 ../gio/glocalfileoutputstream.c:726
#, c-format
msgid "Error reading from file: %s"
msgstr "读取文件出错：%s"
-#: ../gio/glocalfileinputstream.c:216 ../gio/glocalfileinputstream.c:228
-#: ../gio/glocalfileinputstream.c:340 ../gio/glocalfileoutputstream.c:470
-#: ../gio/glocalfileoutputstream.c:1042
+#: ../gio/glocalfileinputstream.c:217 ../gio/glocalfileinputstream.c:229
+#: ../gio/glocalfileinputstream.c:336 ../gio/glocalfileoutputstream.c:464
+#: ../gio/glocalfileoutputstream.c:1036
#, c-format
msgid "Error seeking in file: %s"
msgstr "在文件中定位时出错：%s"
-#: ../gio/glocalfileinputstream.c:261 ../gio/glocalfileoutputstream.c:256
-#: ../gio/glocalfileoutputstream.c:351
+#: ../gio/glocalfileinputstream.c:258 ../gio/glocalfileoutputstream.c:254
+#: ../gio/glocalfileoutputstream.c:348
#, c-format
msgid "Error closing file: %s"
msgstr "关闭文件出错：%s"
-#: ../gio/glocalfilemonitor.c:212
+#: ../gio/glocalfilemonitor.c:176
msgid "Unable to find default local file monitor type"
msgstr "无法找到默认的本地文件监视器类型"
-#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:235
-#: ../gio/glocalfileoutputstream.c:753
+#: ../gio/glocalfileoutputstream.c:202 ../gio/glocalfileoutputstream.c:234
+#: ../gio/glocalfileoutputstream.c:747
#, c-format
msgid "Error writing to file: %s"
msgstr "写入文件出错：%s"
-#: ../gio/glocalfileoutputstream.c:283
+#: ../gio/glocalfileoutputstream.c:281
#, c-format
msgid "Error removing old backup link: %s"
msgstr "移除旧的备份链接出错：%s"
-#: ../gio/glocalfileoutputstream.c:297 ../gio/glocalfileoutputstream.c:310
+#: ../gio/glocalfileoutputstream.c:295 ../gio/glocalfileoutputstream.c:308
#, c-format
msgid "Error creating backup copy: %s"
msgstr "创建备份拷贝：%s"
-#: ../gio/glocalfileoutputstream.c:328
+#: ../gio/glocalfileoutputstream.c:326
#, c-format
msgid "Error renaming temporary file: %s"
msgstr "重命名临时文件出错：%s"
-#: ../gio/glocalfileoutputstream.c:516 ../gio/glocalfileoutputstream.c:1093
+#: ../gio/glocalfileoutputstream.c:510 ../gio/glocalfileoutputstream.c:1087
#, c-format
msgid "Error truncating file: %s"
msgstr "截断文件出错：%s"
-#: ../gio/glocalfileoutputstream.c:587 ../gio/glocalfileoutputstream.c:640
-#: ../gio/glocalfileoutputstream.c:685 ../gio/glocalfileoutputstream.c:825
-#: ../gio/glocalfileoutputstream.c:1074 ../gio/glocalfileoutputstream.c:1173
+#: ../gio/glocalfileoutputstream.c:581 ../gio/glocalfileoutputstream.c:634
+#: ../gio/glocalfileoutputstream.c:679 ../gio/glocalfileoutputstream.c:819
+#: ../gio/glocalfileoutputstream.c:1068 ../gio/glocalfileoutputstream.c:1167
#, c-format
msgid "Error opening file '%s': %s"
msgstr "打开文件“%s”出错：%s"
-#: ../gio/glocalfileoutputstream.c:856
+#: ../gio/glocalfileoutputstream.c:850
msgid "Target file is a directory"
msgstr "目标文件是目录"
-#: ../gio/glocalfileoutputstream.c:861
+#: ../gio/glocalfileoutputstream.c:855
msgid "Target file is not a regular file"
msgstr "目标文件不是普通文件"
-#: ../gio/glocalfileoutputstream.c:873
+#: ../gio/glocalfileoutputstream.c:867
msgid "The file was externally modified"
msgstr "文件已经被其他程序修改"
-#: ../gio/glocalfileoutputstream.c:1058
+#: ../gio/glocalfileoutputstream.c:1052
#, c-format
msgid "Error removing old file: %s"
msgstr "移除旧文件出错：%s"
-#: ../gio/gmemoryinputstream.c:492 ../gio/gmemoryoutputstream.c:750
+#: ../gio/gmemoryinputstream.c:476 ../gio/gmemoryoutputstream.c:739
msgid "Invalid GSeekType supplied"
msgstr "提供的 GSeekType 无效"
-#: ../gio/gmemoryinputstream.c:502
+#: ../gio/gmemoryinputstream.c:486
msgid "Invalid seek request"
-msgstr "无效的查找请求"
+msgstr "无效的搜寻请求"
-#: ../gio/gmemoryinputstream.c:526
+#: ../gio/gmemoryinputstream.c:510
msgid "Cannot truncate GMemoryInputStream"
msgstr "无法截断 GMemoryInputStream"
-#: ../gio/gmemoryoutputstream.c:496
+#: ../gio/gmemoryoutputstream.c:544
msgid "Memory output stream not resizable"
msgstr "内存输出流无法改变大小"
-#: ../gio/gmemoryoutputstream.c:512
+#: ../gio/gmemoryoutputstream.c:560
msgid "Failed to resize memory output stream"
msgstr "改变内存输出流大小失败"
-#: ../gio/gmemoryoutputstream.c:600
+#: ../gio/gmemoryoutputstream.c:648
msgid ""
"Amount of memory required to process the write is larger than available "
"address space"
msgstr "处理写入所需要的内存超过了可用的空间"
-#: ../gio/gmemoryoutputstream.c:760
+#: ../gio/gmemoryoutputstream.c:749
msgid "Requested seek before the beginning of the stream"
msgstr "请求的定位值在流的开始之前"
-#: ../gio/gmemoryoutputstream.c:769
+#: ../gio/gmemoryoutputstream.c:758
msgid "Requested seek beyond the end of the stream"
msgstr "请求的定位值在流的结束之后"
#. Translators: This is an error
#. * message for mount objects that
#. * don't implement unmount.
-#: ../gio/gmount.c:363
+#: ../gio/gmount.c:395
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:442
+#: ../gio/gmount.c:471
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:523
+#: ../gio/gmount.c:549
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:611
+#: ../gio/gmount.c:634
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:701
+#: ../gio/gmount.c:722
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:785
+#: ../gio/gmount.c:803
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:874
+#: ../gio/gmount.c:889
msgid "mount doesn't implement synchronous content type guessing"
msgstr "挂载未实现同步内容类型猜测"
-#: ../gio/gnetworkaddress.c:322
+#: ../gio/gnetworkaddress.c:354
#, c-format
msgid "Hostname '%s' contains '[' but not ']'"
msgstr "主机名“%s”包含“[”但是缺少“]”"
-#: ../gio/gnetworkmonitorbase.c:178
+#: ../gio/gnetworkmonitorbase.c:195 ../gio/gnetworkmonitorbase.c:298
msgid "Network unreachable"
msgstr "网络不可达"
-#: ../gio/gnetworkmonitorbase.c:218
+#: ../gio/gnetworkmonitorbase.c:233 ../gio/gnetworkmonitorbase.c:263
msgid "Host unreachable"
msgstr "主机不可达"
-#: ../gio/gnetworkmonitornetlink.c:97 ../gio/gnetworkmonitornetlink.c:109
-#: ../gio/gnetworkmonitornetlink.c:120
+#: ../gio/gnetworkmonitornetlink.c:98 ../gio/gnetworkmonitornetlink.c:110
+#: ../gio/gnetworkmonitornetlink.c:129
#, c-format
msgid "Could not create network monitor: %s"
msgstr "不能创建网络监视器：%s"
-#: ../gio/gnetworkmonitornetlink.c:129
+#: ../gio/gnetworkmonitornetlink.c:119
msgid "Could not create network monitor: "
msgstr "不能创建网络监视器："
@@ -1900,74 +1967,49 @@ msgstr "不能创建网络监视器："
msgid "Could not get network status: "
msgstr "不能获取网络状态： %s"
-#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:417
+#: ../gio/goutputstream.c:212 ../gio/goutputstream.c:464
msgid "Output stream doesn't implement write"
msgstr "输出流未实现写入(write)"
-#: ../gio/goutputstream.c:378 ../gio/goutputstream.c:876
+#: ../gio/goutputstream.c:425 ../gio/goutputstream.c:950
msgid "Source stream is already closed"
msgstr "源流已经关闭"
-#: ../gio/gresolver.c:764
-#, c-format
-msgid "Error resolving '%s': %s"
-msgstr "解析“%s”出错：%s"
-
-#: ../gio/gresolver.c:814
-#, c-format
-msgid "Error reverse-resolving '%s': %s"
-msgstr "反向解析“%s”出错：%s"
-
-#: ../gio/gresolver.c:849 ../gio/gresolver.c:928
-#, c-format
-msgid "No service record for '%s'"
-msgstr "没有“%s”的服务记录"
-
-#: ../gio/gresolver.c:854 ../gio/gresolver.c:933
-#, c-format
-msgid "Temporarily unable to resolve '%s'"
-msgstr "暂时无法解析“%s”"
-
-#: ../gio/gresolver.c:859 ../gio/gresolver.c:938
-#, c-format
-msgid "Error resolving '%s'"
-msgstr "解析“%s”出错"
-
-#: ../gio/gresource.c:295 ../gio/gresource.c:540 ../gio/gresource.c:557
-#: ../gio/gresource.c:678 ../gio/gresource.c:747 ../gio/gresource.c:808
-#: ../gio/gresource.c:888 ../gio/gresourcefile.c:452
-#: ../gio/gresourcefile.c:552 ../gio/gresourcefile.c:654
+#: ../gio/gresource.c:291 ../gio/gresource.c:539 ../gio/gresource.c:556
+#: ../gio/gresource.c:677 ../gio/gresource.c:746 ../gio/gresource.c:807
+#: ../gio/gresource.c:887 ../gio/gresourcefile.c:454
+#: ../gio/gresourcefile.c:555 ../gio/gresourcefile.c:657
#, c-format
msgid "The resource at '%s' does not exist"
msgstr "位于 “%s”的资源不存在"
-#: ../gio/gresource.c:457
+#: ../gio/gresource.c:456
#, c-format
msgid "The resource at '%s' failed to decompress"
msgstr "解压位于“%s”的资源失败"
-#: ../gio/gresourcefile.c:650
+#: ../gio/gresourcefile.c:653
#, c-format
msgid "The resource at '%s' is not a directory"
msgstr "“%s” 处的资源并非目录"
-#: ../gio/gresourcefile.c:858
+#: ../gio/gresourcefile.c:861
msgid "Input stream doesn't implement seek"
-msgstr "输入流未实现搜寻(seek)"
+msgstr "输入流未实现定位(seek)"
-#: ../gio/gresource-tool.c:470 ../gio/gsettings-tool.c:530
+#: ../gio/gresource-tool.c:475 ../gio/gsettings-tool.c:529
msgid "Print help"
msgstr "打印帮助"
-#: ../gio/gresource-tool.c:471 ../gio/gresource-tool.c:539
+#: ../gio/gresource-tool.c:476 ../gio/gresource-tool.c:544
msgid "[COMMAND]"
msgstr "[COMMAND]"
-#: ../gio/gresource-tool.c:476
+#: ../gio/gresource-tool.c:481
msgid "List sections containing resources in an elf FILE"
msgstr "列出 ELF 文件 FILE 中包含资源的段"
-#: ../gio/gresource-tool.c:482
+#: ../gio/gresource-tool.c:487
msgid ""
"List resources\n"
"If SECTION is given, only list resources in this section\n"
@@ -1977,16 +2019,16 @@ msgstr ""
"如果指定了 SECTION，则仅在此段中列出资源\n"
"如果指定了 PATH，则仅列出匹配的资源"
-#: ../gio/gresource-tool.c:485 ../gio/gresource-tool.c:495
+#: ../gio/gresource-tool.c:490 ../gio/gresource-tool.c:500
msgid "FILE [PATH]"
msgstr "FILE [PATH]"
-#: ../gio/gresource-tool.c:486 ../gio/gresource-tool.c:496
-#: ../gio/gresource-tool.c:503
+#: ../gio/gresource-tool.c:491 ../gio/gresource-tool.c:501
+#: ../gio/gresource-tool.c:508
msgid "SECTION"
msgstr "SECTION"
-#: ../gio/gresource-tool.c:491
+#: ../gio/gresource-tool.c:496
msgid ""
"List resources with details\n"
"If SECTION is given, only list resources in this section\n"
@@ -1998,15 +2040,15 @@ msgstr ""
"如果指定了 PATH，则仅列出匹配的资源\n"
"详细信息包括段、大小和压缩情况"
-#: ../gio/gresource-tool.c:501
+#: ../gio/gresource-tool.c:506
msgid "Extract a resource file to stdout"
msgstr "提取一个资源文件到标准输出"
-#: ../gio/gresource-tool.c:502
+#: ../gio/gresource-tool.c:507
msgid "FILE PATH"
msgstr "FILE PATH"
-#: ../gio/gresource-tool.c:508 ../gio/gsettings-tool.c:610
+#: ../gio/gresource-tool.c:513 ../gio/gsettings-tool.c:609
#, c-format
msgid ""
"Unknown command %s\n"
@@ -2015,7 +2057,7 @@ msgstr ""
"未知命令 %s\n"
"\n"
-#: ../gio/gresource-tool.c:516
+#: ../gio/gresource-tool.c:521
msgid ""
"Usage:\n"
" gresource [--section SECTION] COMMAND [ARGS...]\n"
@@ -2043,7 +2085,7 @@ msgstr ""
"使用“gresoure help COMMAND”获取详细帮助。\n"
"\n"
-#: ../gio/gresource-tool.c:530
+#: ../gio/gresource-tool.c:535
#, c-format
msgid ""
"Usage:\n"
@@ -2058,23 +2100,23 @@ msgstr ""
"%s\n"
"\n"
-#: ../gio/gresource-tool.c:533 ../gio/gsettings-tool.c:643
+#: ../gio/gresource-tool.c:538 ../gio/gsettings-tool.c:642
msgid "Arguments:\n"
msgstr "参数：\n"
-#: ../gio/gresource-tool.c:537
+#: ../gio/gresource-tool.c:542
msgid " SECTION An (optional) elf section name\n"
msgstr " SECTION ELF 段名(可选)\n"
-#: ../gio/gresource-tool.c:541 ../gio/gsettings-tool.c:650
+#: ../gio/gresource-tool.c:546 ../gio/gsettings-tool.c:649
msgid " COMMAND The (optional) command to explain\n"
msgstr " COMMAND 要解释的命令(可选)\n"
-#: ../gio/gresource-tool.c:547
+#: ../gio/gresource-tool.c:552
msgid " FILE An elf file (a binary or a shared library)\n"
msgstr " FILE ELF 文件(可执行文件或共享库)\n"
-#: ../gio/gresource-tool.c:550
+#: ../gio/gresource-tool.c:555
msgid ""
" FILE An elf file (a binary or a shared library)\n"
" or a compiled resource file\n"
@@ -2082,89 +2124,89 @@ msgstr ""
" FILE ELF 文件(可执行文件或共享库)\n"
" 或已编译的资源文件\n"
-#: ../gio/gresource-tool.c:554
+#: ../gio/gresource-tool.c:559
msgid "[PATH]"
msgstr "[PATH]"
-#: ../gio/gresource-tool.c:556
+#: ../gio/gresource-tool.c:561
msgid " PATH An (optional) resource path (may be partial)\n"
msgstr " PATH (部分)资源路径(可选)\n"
-#: ../gio/gresource-tool.c:557
+#: ../gio/gresource-tool.c:562
msgid "PATH"
msgstr "PATH"
-#: ../gio/gresource-tool.c:559
+#: ../gio/gresource-tool.c:564
msgid " PATH A resource path\n"
msgstr " PATH 资源路径\n"
-#: ../gio/gsettings-tool.c:53 ../gio/gsettings-tool.c:74
+#: ../gio/gsettings-tool.c:57 ../gio/gsettings-tool.c:78
#, c-format
msgid "No such schema '%s'\n"
msgstr "没有“%s”这个方案\n"
-#: ../gio/gsettings-tool.c:59
+#: ../gio/gsettings-tool.c:63
#, c-format
msgid "Schema '%s' is not relocatable (path must not be specified)\n"
msgstr "“%s”方案不可重定向(必须指定路径)\n"
-#: ../gio/gsettings-tool.c:80
+#: ../gio/gsettings-tool.c:84
#, c-format
msgid "Schema '%s' is relocatable (path must be specified)\n"
msgstr "“%s”方案可重定向(必须指定路径)\n"
-#: ../gio/gsettings-tool.c:94
+#: ../gio/gsettings-tool.c:98
#, c-format
msgid "Empty path given.\n"
msgstr "指定的路径为空。\n"
-#: ../gio/gsettings-tool.c:100
+#: ../gio/gsettings-tool.c:104
#, c-format
msgid "Path must begin with a slash (/)\n"
msgstr "路径必须以斜杠开头(/)\n"
-#: ../gio/gsettings-tool.c:106
+#: ../gio/gsettings-tool.c:110
#, c-format
msgid "Path must end with a slash (/)\n"
msgstr "路径必须以斜杠结束(/)\n"
-#: ../gio/gsettings-tool.c:112
+#: ../gio/gsettings-tool.c:116
#, c-format
msgid "Path must not contain two adjacent slashes (//)\n"
msgstr "路径中不能包含连续两个斜杠(//)\n"
-#: ../gio/gsettings-tool.c:133
+#: ../gio/gsettings-tool.c:137
#, c-format
msgid "No such key '%s'\n"
msgstr "没有“%s”这个键\n"
-#: ../gio/gsettings-tool.c:503
+#: ../gio/gsettings-tool.c:502
#, c-format
msgid "The provided value is outside of the valid range\n"
msgstr "提供的值不在有效范围内\n"
-#: ../gio/gsettings-tool.c:536
+#: ../gio/gsettings-tool.c:535
msgid "List the installed (non-relocatable) schemas"
msgstr "列出安装的(不可重定向的)方案"
-#: ../gio/gsettings-tool.c:542
+#: ../gio/gsettings-tool.c:541
msgid "List the installed relocatable schemas"
msgstr "列出安装的可重定向方案"
-#: ../gio/gsettings-tool.c:548
+#: ../gio/gsettings-tool.c:547
msgid "List the keys in SCHEMA"
msgstr "列出 SCHEMA 中的键"
-#: ../gio/gsettings-tool.c:549 ../gio/gsettings-tool.c:555
-#: ../gio/gsettings-tool.c:592
+#: ../gio/gsettings-tool.c:548 ../gio/gsettings-tool.c:554
+#: ../gio/gsettings-tool.c:591
msgid "SCHEMA[:PATH]"
msgstr "SCHEMA[:PATH]"
-#: ../gio/gsettings-tool.c:554
+#: ../gio/gsettings-tool.c:553
msgid "List the children of SCHEMA"
msgstr "列出 SCHEMA 的子对象"
-#: ../gio/gsettings-tool.c:560
+#: ../gio/gsettings-tool.c:559
msgid ""
"List keys and values, recursively\n"
"If no SCHEMA is given, list all keys\n"
@@ -2172,44 +2214,44 @@ msgstr ""
"递归列出键和值\n"
"如果没有给出 SCHEMA，列出所有键\n"
-#: ../gio/gsettings-tool.c:562
+#: ../gio/gsettings-tool.c:561
msgid "[SCHEMA[:PATH]]"
msgstr "SCHEMA[:PATH]"
-#: ../gio/gsettings-tool.c:567
+#: ../gio/gsettings-tool.c:566
msgid "Get the value of KEY"
msgstr "获取 KEY 的值"
-#: ../gio/gsettings-tool.c:568 ../gio/gsettings-tool.c:574
-#: ../gio/gsettings-tool.c:586 ../gio/gsettings-tool.c:598
+#: ../gio/gsettings-tool.c:567 ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:585 ../gio/gsettings-tool.c:597
msgid "SCHEMA[:PATH] KEY"
msgstr "SCHEMA[:PATH] KEY"
-#: ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:572
msgid "Query the range of valid values for KEY"
msgstr "查询 KEY 的有效值范围"
-#: ../gio/gsettings-tool.c:579
+#: ../gio/gsettings-tool.c:578
msgid "Set the value of KEY to VALUE"
msgstr "将 KEY 的值设为 VALUE"
-#: ../gio/gsettings-tool.c:580
+#: ../gio/gsettings-tool.c:579
msgid "SCHEMA[:PATH] KEY VALUE"
msgstr "SCHEMA[:PATH] KEY VALUE"
-#: ../gio/gsettings-tool.c:585
+#: ../gio/gsettings-tool.c:584
msgid "Reset KEY to its default value"
msgstr "将 KEY 重设为默认值"
-#: ../gio/gsettings-tool.c:591
+#: ../gio/gsettings-tool.c:590
msgid "Reset all keys in SCHEMA to their defaults"
msgstr "重置 SCHEMA 中所有键为默认值"
-#: ../gio/gsettings-tool.c:597
+#: ../gio/gsettings-tool.c:596
msgid "Check if KEY is writable"
msgstr "查看 KEY 是否可写"
-#: ../gio/gsettings-tool.c:603
+#: ../gio/gsettings-tool.c:602
msgid ""
"Monitor KEY for changes.\n"
"If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2219,11 +2261,11 @@ msgstr ""
"如果没有指定 KEY，则监视 SCHEMA 中的所有键。\n"
"使用 ^C 停止监视。\n"
-#: ../gio/gsettings-tool.c:606
+#: ../gio/gsettings-tool.c:605
msgid "SCHEMA[:PATH] [KEY]"
msgstr "SCHEMA[:PATH] [KEY]"
-#: ../gio/gsettings-tool.c:618
+#: ../gio/gsettings-tool.c:617
msgid ""
"Usage:\n"
" gsettings [--schemadir SCHEMADIR] COMMAND [ARGS...]\n"
@@ -2267,7 +2309,7 @@ msgstr ""
"使用 'gsettings help 命令' 查看详细的帮助。\n"
"\n"
-#: ../gio/gsettings-tool.c:640
+#: ../gio/gsettings-tool.c:639
#, c-format
msgid ""
"Usage:\n"
@@ -2282,11 +2324,11 @@ msgstr ""
"%s\n"
"\n"
-#: ../gio/gsettings-tool.c:646
+#: ../gio/gsettings-tool.c:645
msgid " SCHEMADIR A directory to search for additional schemas\n"
msgstr " SCHEMADIR 一个用于搜索附加方案的目录\n"
-#: ../gio/gsettings-tool.c:654
+#: ../gio/gsettings-tool.c:653
msgid ""
" SCHEMA The name of the schema\n"
" PATH The path, for relocatable schemas\n"
@@ -2294,172 +2336,176 @@ msgstr ""
" SCHEMA 方案的名称\n"
" PATH 可重定向方案的路径\n"
-#: ../gio/gsettings-tool.c:659
+#: ../gio/gsettings-tool.c:658
msgid " KEY The (optional) key within the schema\n"
msgstr " KEY 方案中(可选)的键\n"
-#: ../gio/gsettings-tool.c:663
+#: ../gio/gsettings-tool.c:662
msgid " KEY The key within the schema\n"
msgstr " KEY 方案中的键\n"
-#: ../gio/gsettings-tool.c:667
+#: ../gio/gsettings-tool.c:666
msgid " VALUE The value to set\n"
msgstr " VALUE 要设的值\n"
-#: ../gio/gsettings-tool.c:788
+#: ../gio/gsettings-tool.c:784
#, c-format
msgid "Empty schema name given\n"
msgstr "给出了空的大纲名称\n"
-#: ../gio/gsocket.c:282
+#: ../gio/gsocket.c:311
msgid "Invalid socket, not initialized"
msgstr "无效的套接字，尚未初始化"
-#: ../gio/gsocket.c:289
+#: ../gio/gsocket.c:318
#, c-format
msgid "Invalid socket, initialization failed due to: %s"
msgstr "无效的套接字，初始化失败的原因是：%s"
-#: ../gio/gsocket.c:297
+#: ../gio/gsocket.c:326
msgid "Socket is already closed"
msgstr "套接字已经关闭"
-#: ../gio/gsocket.c:305 ../gio/gsocket.c:3527 ../gio/gsocket.c:3582
+#: ../gio/gsocket.c:334 ../gio/gsocket.c:3525 ../gio/gsocket.c:3580
msgid "Socket I/O timed out"
msgstr "套接字 I/O 超时"
-#: ../gio/gsocket.c:472
+#: ../gio/gsocket.c:481
#, c-format
msgid "creating GSocket from fd: %s"
msgstr "从文件描述符创建 GSocket：%s"
-#: ../gio/gsocket.c:506 ../gio/gsocket.c:513 ../gio/gsocket.c:529
+#: ../gio/gsocket.c:509 ../gio/gsocket.c:563 ../gio/gsocket.c:570
#, c-format
msgid "Unable to create socket: %s"
msgstr "无法创建套接字：%s"
-#: ../gio/gsocket.c:506
+#: ../gio/gsocket.c:563
msgid "Unknown family was specified"
msgstr "指定了未知协议族"
-#: ../gio/gsocket.c:513
+#: ../gio/gsocket.c:570
msgid "Unknown protocol was specified"
msgstr "指定了未知协议"
-#: ../gio/gsocket.c:1720
+#: ../gio/gsocket.c:1728
#, c-format
msgid "could not get local address: %s"
msgstr "不能获取本地地址：%s"
-#: ../gio/gsocket.c:1763
+#: ../gio/gsocket.c:1771
#, c-format
msgid "could not get remote address: %s"
msgstr "不能获取远程地址： %s"
-#: ../gio/gsocket.c:1824
+#: ../gio/gsocket.c:1832
#, c-format
msgid "could not listen: %s"
msgstr "无法监听：%s"
-#: ../gio/gsocket.c:1898
+#: ../gio/gsocket.c:1904
#, c-format
msgid "Error binding to address: %s"
msgstr "错误绑定地址：%s"
-#: ../gio/gsocket.c:1951 ../gio/gsocket.c:1987
+#: ../gio/gsocket.c:1957 ../gio/gsocket.c:1994
#, c-format
msgid "Error joining multicast group: %s"
msgstr "加入多播组出错：%s"
-#: ../gio/gsocket.c:1952 ../gio/gsocket.c:1988
+#: ../gio/gsocket.c:1958 ../gio/gsocket.c:1995
#, c-format
msgid "Error leaving multicast group: %s"
msgstr "退出多播组出错：%s"
-#: ../gio/gsocket.c:1953
+#: ../gio/gsocket.c:1959
msgid "No support for source-specific multicast"
msgstr "不支持指定源的多播"
-#: ../gio/gsocket.c:2172
+#: ../gio/gsocket.c:2178
#, c-format
msgid "Error accepting connection: %s"
msgstr "接受连接时出错：%s"
-#: ../gio/gsocket.c:2293
+#: ../gio/gsocket.c:2299
msgid "Connection in progress"
msgstr "正在连接"
-#: ../gio/gsocket.c:2345 ../gio/gsocket.c:4324
-#, c-format
-msgid "Unable to get pending error: %s"
-msgstr "无法获取未决的错误：%s"
+#: ../gio/gsocket.c:2346
+msgid "Unable to get pending error: "
+msgstr "无法获取未决的错误："
-#: ../gio/gsocket.c:2515
+#: ../gio/gsocket.c:2512
#, c-format
msgid "Error receiving data: %s"
msgstr "接收数据出错：%s"
-#: ../gio/gsocket.c:2693
+#: ../gio/gsocket.c:2690
#, c-format
msgid "Error sending data: %s"
msgstr "发送数据出错：%s"
-#: ../gio/gsocket.c:2807
+#: ../gio/gsocket.c:2804
#, c-format
msgid "Unable to shutdown socket: %s"
msgstr "无法关闭套接字：%s"
-#: ../gio/gsocket.c:2886
+#: ../gio/gsocket.c:2883
#, c-format
msgid "Error closing socket: %s"
msgstr "关闭套接字出错：%s"
-#: ../gio/gsocket.c:3520
+#: ../gio/gsocket.c:3518
#, c-format
msgid "Waiting for socket condition: %s"
msgstr "等待套接字状态：%s"
-#: ../gio/gsocket.c:3798 ../gio/gsocket.c:3879
+#: ../gio/gsocket.c:3796 ../gio/gsocket.c:3877
#, c-format
msgid "Error sending message: %s"
msgstr "发送信息出错：%s"
-#: ../gio/gsocket.c:3823
-msgid "GSocketControlMessage not supported on windows"
+#: ../gio/gsocket.c:3821
+msgid "GSocketControlMessage not supported on Windows"
msgstr "Windows 不支持 GSocketControlMessage"
-#: ../gio/gsocket.c:4103 ../gio/gsocket.c:4239
+#: ../gio/gsocket.c:4155 ../gio/gsocket.c:4290
#, c-format
msgid "Error receiving message: %s"
msgstr "接受信息出错：%s"
-#: ../gio/gsocket.c:4343
+#: ../gio/gsocket.c:4372
+#, c-format
+msgid "Unable to get pending error: %s"
+msgstr "无法获取未决的错误：%s"
+
+#: ../gio/gsocket.c:4391
msgid "g_socket_get_credentials not implemented for this OS"
msgstr "此操作系统上没有实现 g_socket_get_credentials"
-#: ../gio/gsocketclient.c:174
+#: ../gio/gsocketclient.c:177
#, c-format
msgid "Could not connect to proxy server %s: "
msgstr "不能连接到代理服务器 %s："
-#: ../gio/gsocketclient.c:188
+#: ../gio/gsocketclient.c:191
#, c-format
msgid "Could not connect to %s: "
msgstr "无法连接到 %s："
-#: ../gio/gsocketclient.c:190
+#: ../gio/gsocketclient.c:193
msgid "Could not connect: "
msgstr "无法连接："
-#: ../gio/gsocketclient.c:976 ../gio/gsocketclient.c:1547
+#: ../gio/gsocketclient.c:1072 ../gio/gsocketclient.c:1636
msgid "Unknown error on connect"
msgstr "连接时出现未知错误"
-#: ../gio/gsocketclient.c:1029 ../gio/gsocketclient.c:1486
-msgid "Trying to proxy over non-TCP connection is not supported."
+#: ../gio/gsocketclient.c:1125 ../gio/gsocketclient.c:1574
+msgid "Proxying over a non-TCP connection is not supported."
msgstr "不支持通过非 TCP 连接的代理。"
-#: ../gio/gsocketclient.c:1055 ../gio/gsocketclient.c:1507
+#: ../gio/gsocketclient.c:1151 ../gio/gsocketclient.c:1595
#, c-format
msgid "Proxy protocol '%s' is not supported."
msgstr "不支持 %s 代理协议。"
@@ -2472,25 +2518,25 @@ msgstr "监听器已关闭"
msgid "Added socket is closed"
msgstr "新增套接字已关闭"
-#: ../gio/gsocks4aproxy.c:121
+#: ../gio/gsocks4aproxy.c:120
#, c-format
msgid "SOCKSv4 does not support IPv6 address '%s'"
msgstr "SOCKSv4 不支持 IPv6 地址 %s"
-#: ../gio/gsocks4aproxy.c:139
+#: ../gio/gsocks4aproxy.c:138
msgid "Username is too long for SOCKSv4 protocol"
msgstr "用户名对于 SOCKSv4 协议太长。"
-#: ../gio/gsocks4aproxy.c:156
+#: ../gio/gsocks4aproxy.c:155
#, c-format
msgid "Hostname '%s' is too long for SOCKSv4 protocol"
msgstr "主机名 %s 对于 SOCKSv4 协议太长"
-#: ../gio/gsocks4aproxy.c:182
+#: ../gio/gsocks4aproxy.c:181
msgid "The server is not a SOCKSv4 proxy server."
msgstr "此服务器不是 SOCKSv4 代理服务器。"
-#: ../gio/gsocks4aproxy.c:189
+#: ../gio/gsocks4aproxy.c:188
msgid "Connection through SOCKSv4 server was rejected"
msgstr "通过 SOCKSv4 服务器连接被拒绝"
@@ -2563,23 +2609,48 @@ msgstr "未知 SOCKSv5 代理错误。"
msgid "Can't handle version %d of GThemedIcon encoding"
msgstr "无法处理 GThemedIcon 编码的版本 %d"
-#: ../gio/gtlscertificate.c:249
+#: ../gio/gthreadedresolver.c:110
+#, c-format
+msgid "Error resolving '%s': %s"
+msgstr "解析“%s”出错：%s"
+
+#: ../gio/gthreadedresolver.c:195
+#, c-format
+msgid "Error reverse-resolving '%s': %s"
+msgstr "反向解析“%s”出错：%s"
+
+#: ../gio/gthreadedresolver.c:397 ../gio/gthreadedresolver.c:571
+#, c-format
+msgid "No DNS record of the requested type for '%s'"
+msgstr "“%s”：没有所请求类型的 DNS 记录"
+
+#: ../gio/gthreadedresolver.c:402 ../gio/gthreadedresolver.c:576
+#, c-format
+msgid "Temporarily unable to resolve '%s'"
+msgstr "暂时无法解析“%s”"
+
+#: ../gio/gthreadedresolver.c:407 ../gio/gthreadedresolver.c:581
+#, c-format
+msgid "Error resolving '%s'"
+msgstr "解析“%s”出错"
+
+#: ../gio/gtlscertificate.c:248
msgid "Cannot decrypt PEM-encoded private key"
msgstr "无法解密 PEM 加密的私钥"
-#: ../gio/gtlscertificate.c:254
+#: ../gio/gtlscertificate.c:253
msgid "No PEM-encoded private key found"
msgstr "未找到 PEM 加密的私钥"
-#: ../gio/gtlscertificate.c:264
+#: ../gio/gtlscertificate.c:263
msgid "Could not parse PEM-encoded private key"
msgstr "无法解析 PEM 加密的私钥"
-#: ../gio/gtlscertificate.c:289
+#: ../gio/gtlscertificate.c:288
msgid "No PEM-encoded certificate found"
msgstr "未找到 PEM 加密的证书"
-#: ../gio/gtlscertificate.c:298
+#: ../gio/gtlscertificate.c:297
msgid "Could not parse PEM-encoded certificate"
msgstr "无法解析 PEM 加密的证书"
@@ -2599,94 +2670,84 @@ msgstr "密码多次输入错误，您的访问将在下一次错误输入后锁
msgid "The password entered is incorrect."
msgstr "输入的密码不正确。"
-#: ../gio/gunixconnection.c:164 ../gio/gunixconnection.c:582
+#: ../gio/gunixconnection.c:159 ../gio/gunixconnection.c:548
#, c-format
msgid "Expecting 1 control message, got %d"
msgstr "期望一个控制信息，却得到 %d 个"
-#: ../gio/gunixconnection.c:177 ../gio/gunixconnection.c:592
+#: ../gio/gunixconnection.c:172 ../gio/gunixconnection.c:558
msgid "Unexpected type of ancillary data"
msgstr "非预期的辅助数据类型"
-#: ../gio/gunixconnection.c:195
+#: ../gio/gunixconnection.c:190
#, c-format
msgid "Expecting one fd, but got %d\n"
msgstr "期望一个文件描述符，却得到 %d 个\n"
-#: ../gio/gunixconnection.c:211
+#: ../gio/gunixconnection.c:206
msgid "Received invalid fd"
msgstr "收到无效文件描述符"
-#: ../gio/gunixconnection.c:347
+#: ../gio/gunixconnection.c:342
msgid "Error sending credentials: "
msgstr "发送证书出错："
-#: ../gio/gunixconnection.c:511
+#: ../gio/gunixconnection.c:490
#, c-format
msgid "Error checking if SO_PASSCRED is enabled for socket: %s"
msgstr "检查套接字是否启用 SO_PASSCRED 出错：%s"
-#: ../gio/gunixconnection.c:520
-#, c-format
-msgid ""
-"Unexpected option length while checking if SO_PASSCRED is enabled for "
-"socket. Expected %d bytes, got %d"
-msgstr "检查套接字是否启用 SO_PASSCRED 时选项长度异常。期望 %d 字节，获得了 %d"
-
-#: ../gio/gunixconnection.c:537
+#: ../gio/gunixconnection.c:505
#, c-format
msgid "Error enabling SO_PASSCRED: %s"
msgstr "启用 SO_PASSCRED 出错：%s"
-#: ../gio/gunixconnection.c:568
+#: ../gio/gunixconnection.c:534
msgid ""
"Expecting to read a single byte for receiving credentials but read zero bytes"
msgstr "期望为接收证书读到单个字节但是只读到了 0 字节"
-#: ../gio/gunixconnection.c:606
+#: ../gio/gunixconnection.c:572
#, c-format
msgid "Not expecting control message, but got %d"
msgstr "未期望控制信息，却得到 %d 个"
-#: ../gio/gunixconnection.c:632
+#: ../gio/gunixconnection.c:596
#, c-format
msgid "Error while disabling SO_PASSCRED: %s"
msgstr "禁用 SO_PASSCRED 时出错：%s"
-#: ../gio/gunixinputstream.c:392 ../gio/gunixinputstream.c:413
-#: ../gio/gunixinputstream.c:493
+#: ../gio/gunixinputstream.c:382 ../gio/gunixinputstream.c:403
#, c-format
msgid "Error reading from file descriptor: %s"
msgstr "从文件描述符读取出错：%s"
-#: ../gio/gunixinputstream.c:448 ../gio/gunixinputstream.c:643
-#: ../gio/gunixoutputstream.c:434 ../gio/gunixoutputstream.c:598
+#: ../gio/gunixinputstream.c:436 ../gio/gunixoutputstream.c:422
#, c-format
msgid "Error closing file descriptor: %s"
msgstr "关闭文件描述符出错：%s"
-#: ../gio/gunixmounts.c:1983 ../gio/gunixmounts.c:2020
+#: ../gio/gunixmounts.c:1983 ../gio/gunixmounts.c:2036
msgid "Filesystem root"
msgstr "文件系统根目录"
-#: ../gio/gunixoutputstream.c:378 ../gio/gunixoutputstream.c:399
-#: ../gio/gunixoutputstream.c:479
+#: ../gio/gunixoutputstream.c:368 ../gio/gunixoutputstream.c:389
#, c-format
msgid "Error writing to file descriptor: %s"
msgstr "写入文件描述符出错：%s"
#: ../gio/gunixsocketaddress.c:244
-msgid "Abstract unix domain socket addresses not supported on this system"
-msgstr "本系统不支持摘要 Unix 域套接字地址"
+msgid "Abstract UNIX domain socket addresses not supported on this system"
+msgstr "本系统不支持抽象 Unix 域套接字地址"
-#: ../gio/gvolume.c:408
+#: ../gio/gvolume.c:439
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:488
+#: ../gio/gvolume.c:516
msgid "volume doesn't implement eject or eject_with_operation"
msgstr "卷未执行 eject 或 eject_with_operation"
@@ -2711,17 +2772,17 @@ msgstr "win32 不支持关联的修改"
msgid "Association creation not supported on win32"
msgstr "win32 不支持关联的创建"
-#: ../gio/gwin32inputstream.c:318
+#: ../gio/gwin32inputstream.c:355
#, c-format
msgid "Error reading from handle: %s"
msgstr "读取句柄出错：%s"
-#: ../gio/gwin32inputstream.c:348 ../gio/gwin32outputstream.c:348
+#: ../gio/gwin32inputstream.c:387 ../gio/gwin32outputstream.c:375
#, c-format
msgid "Error closing handle: %s"
msgstr "关闭句柄出错：%s"
-#: ../gio/gwin32outputstream.c:318
+#: ../gio/gwin32outputstream.c:343
#, c-format
msgid "Error writing to handle: %s"
msgstr "写入句柄出错：%s"
@@ -2743,6 +2804,31 @@ msgstr "需要更多输入"
msgid "Invalid compressed data"
msgstr "无效的压缩数据"
+#: ../gio/tests/gdbus-daemon.c:18
+msgid "Address to listen on"
+msgstr "要监听的地址"
+
+#: ../gio/tests/gdbus-daemon.c:19
+msgid "Ignored, for compat with GTestDbus"
+msgstr "已忽略，以与 GTestDbus 兼容"
+
+#: ../gio/tests/gdbus-daemon.c:20
+msgid "Print address"
+msgstr "打印地址"
+
+#: ../gio/tests/gdbus-daemon.c:21
+msgid "Print address in shell mode"
+msgstr "在 shell 模式中打印地址"
+
+#: ../gio/tests/gdbus-daemon.c:28
+msgid "Run a dbus service"
+msgstr "运行一个 dbus 服务"
+
+#: ../gio/tests/gdbus-daemon.c:42
+#, c-format
+msgid "Wrong args\n"
+msgstr "参数错误\n"
+
#: ../glib/gbookmarkfile.c:760
#, c-format
msgid "Unexpected attribute '%s' for element '%s'"
@@ -2766,94 +2852,94 @@ msgstr "意外标签“%s”，需要标签“%s”"
msgid "Unexpected tag '%s' inside '%s'"
msgstr "“%2$s”中的意外标签“%1$s”"
-#: ../glib/gbookmarkfile.c:1806
+#: ../glib/gbookmarkfile.c:1798
msgid "No valid bookmark file found in data dirs"
msgstr "数据目录中没有找到有效的书签文件"
-#: ../glib/gbookmarkfile.c:2007
+#: ../glib/gbookmarkfile.c:1999
#, c-format
msgid "A bookmark for URI '%s' already exists"
msgstr "URI“%s”的书签已经存在"
-#: ../glib/gbookmarkfile.c:2053 ../glib/gbookmarkfile.c:2211
-#: ../glib/gbookmarkfile.c:2296 ../glib/gbookmarkfile.c:2376
-#: ../glib/gbookmarkfile.c:2461 ../glib/gbookmarkfile.c:2544
-#: ../glib/gbookmarkfile.c:2622 ../glib/gbookmarkfile.c:2701
-#: ../glib/gbookmarkfile.c:2743 ../glib/gbookmarkfile.c:2840
-#: ../glib/gbookmarkfile.c:2960 ../glib/gbookmarkfile.c:3150
-#: ../glib/gbookmarkfile.c:3226 ../glib/gbookmarkfile.c:3391
-#: ../glib/gbookmarkfile.c:3480 ../glib/gbookmarkfile.c:3570
-#: ../glib/gbookmarkfile.c:3698
+#: ../glib/gbookmarkfile.c:2045 ../glib/gbookmarkfile.c:2203
+#: ../glib/gbookmarkfile.c:2288 ../glib/gbookmarkfile.c:2368
+#: ../glib/gbookmarkfile.c:2453 ../glib/gbookmarkfile.c:2536
+#: ../glib/gbookmarkfile.c:2614 ../glib/gbookmarkfile.c:2693
+#: ../glib/gbookmarkfile.c:2735 ../glib/gbookmarkfile.c:2832
+#: ../glib/gbookmarkfile.c:2952 ../glib/gbookmarkfile.c:3142
+#: ../glib/gbookmarkfile.c:3218 ../glib/gbookmarkfile.c:3386
+#: ../glib/gbookmarkfile.c:3475 ../glib/gbookmarkfile.c:3565
+#: ../glib/gbookmarkfile.c:3693
#, c-format
msgid "No bookmark found for URI '%s'"
msgstr "未找到 URI“%s”的书签"
-#: ../glib/gbookmarkfile.c:2385
+#: ../glib/gbookmarkfile.c:2377
#, c-format
msgid "No MIME type defined in the bookmark for URI '%s'"
msgstr "URI“%s”的书签未定义 MIME 类型"
-#: ../glib/gbookmarkfile.c:2470
+#: ../glib/gbookmarkfile.c:2462
#, c-format
msgid "No private flag has been defined in bookmark for URI '%s'"
msgstr "URI“%s”的书签未定义私有标志"
-#: ../glib/gbookmarkfile.c:2849
+#: ../glib/gbookmarkfile.c:2841
#, c-format
msgid "No groups set in bookmark for URI '%s'"
msgstr "URI“%s”的书签未设定组"
-#: ../glib/gbookmarkfile.c:3244 ../glib/gbookmarkfile.c:3401
+#: ../glib/gbookmarkfile.c:3239 ../glib/gbookmarkfile.c:3396
#, c-format
msgid "No application with name '%s' registered a bookmark for '%s'"
msgstr "没有名为“%s”的应用程序为“%s”注册书签"
-#: ../glib/gbookmarkfile.c:3424
+#: ../glib/gbookmarkfile.c:3419
#, c-format
msgid "Failed to expand exec line '%s' with URI '%s'"
msgstr "用 URI“%2$s”展开 exec 行“%1$s”失败"
-#: ../glib/gconvert.c:807 ../glib/gutf8.c:837 ../glib/gutf8.c:1047
+#: ../glib/gconvert.c:803 ../glib/gutf8.c:837 ../glib/gutf8.c:1047
#: ../glib/gutf8.c:1184 ../glib/gutf8.c:1288
msgid "Partial character sequence at end of input"
msgstr "输入末尾出现未尽字符序列"
-#: ../glib/gconvert.c:1057
+#: ../glib/gconvert.c:1053
#, c-format
msgid "Cannot convert fallback '%s' to codeset '%s'"
msgstr "无法转换后备字符集“%s”到字符集“%s”"
-#: ../glib/gconvert.c:1874
+#: ../glib/gconvert.c:1871
#, c-format
msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
msgstr "URI“%s”不是“file”格式的绝对 URI"
-#: ../glib/gconvert.c:1884
+#: ../glib/gconvert.c:1881
#, c-format
msgid "The local file URI '%s' may not include a '#'"
msgstr "本地文件 URI“%s”不能包含“#”"
-#: ../glib/gconvert.c:1901
+#: ../glib/gconvert.c:1898
#, c-format
msgid "The URI '%s' is invalid"
msgstr "URI“%s”无效"
-#: ../glib/gconvert.c:1913
+#: ../glib/gconvert.c:1910
#, c-format
msgid "The hostname of the URI '%s' is invalid"
msgstr "URI中的主机名“%s”无效"
-#: ../glib/gconvert.c:1929
+#: ../glib/gconvert.c:1926
#, c-format
msgid "The URI '%s' contains invalidly escaped characters"
msgstr "URI“%s”中包含无效的转义字符"
-#: ../glib/gconvert.c:2024
+#: ../glib/gconvert.c:2021
#, c-format
msgid "The pathname '%s' is not an absolute path"
msgstr "路径名“%s”不是绝对路径"
-#: ../glib/gconvert.c:2034
+#: ../glib/gconvert.c:2031
msgid "Invalid hostname"
msgstr "无效的主机名"
@@ -3083,270 +3169,271 @@ msgctxt "abbreviated weekday name"
msgid "Sun"
msgstr "日"
-#: ../glib/gdir.c:121 ../glib/gdir.c:144
+#: ../glib/gdir.c:120 ../glib/gdir.c:143
#, c-format
msgid "Error opening directory '%s': %s"
msgstr "打开目录“%s”时发生错误：%s"
-#: ../glib/gfileutils.c:675 ../glib/gfileutils.c:763
+#: ../glib/gfileutils.c:671 ../glib/gfileutils.c:759
#, c-format
-msgid "Could not allocate %lu bytes to read file \"%s\""
-msgstr "无法分配 %lu 字节以读取文件“%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:690
+#: ../glib/gfileutils.c:686
#, c-format
msgid "Error reading file '%s': %s"
msgstr "读取文件“%s”出错：%s"
-#: ../glib/gfileutils.c:704
+#: ../glib/gfileutils.c:700
#, c-format
msgid "File \"%s\" is too large"
msgstr "文件“%s”太大"
-#: ../glib/gfileutils.c:787
+#: ../glib/gfileutils.c:783
#, c-format
msgid "Failed to read from file '%s': %s"
msgstr "读取文件“%s”失败：%s"
-#: ../glib/gfileutils.c:838 ../glib/gfileutils.c:925
+#: ../glib/gfileutils.c:834 ../glib/gfileutils.c:921
#, c-format
msgid "Failed to open file '%s': %s"
msgstr "打开文件“%s”失败：%s"
-#: ../glib/gfileutils.c:855
+#: ../glib/gfileutils.c:851
#, c-format
msgid "Failed to get attributes of file '%s': fstat() failed: %s"
msgstr "获得文件“%s”的属性失败：fstat() 失败：%s"
-#: ../glib/gfileutils.c:889
+#: ../glib/gfileutils.c:885
#, c-format
msgid "Failed to open file '%s': fdopen() failed: %s"
msgstr "打开文件“%s”失败：fdopen() 失败：%s"
-#: ../glib/gfileutils.c:997
+#: ../glib/gfileutils.c:993
#, c-format
msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
msgstr "将文件“%s”重命名为“%s”失败：g_rename() 失败：%s"
-#: ../glib/gfileutils.c:1039 ../glib/gfileutils.c:1584
+#: ../glib/gfileutils.c:1035 ../glib/gfileutils.c:1593
#, c-format
msgid "Failed to create file '%s': %s"
msgstr "创建文件“%s”失败：%s"
-#: ../glib/gfileutils.c:1053
+#: ../glib/gfileutils.c:1049
#, c-format
msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
msgstr "打开文件“%s”写入失败：fdopen() 失败：%s"
-#: ../glib/gfileutils.c:1078
+#: ../glib/gfileutils.c:1074
#, c-format
msgid "Failed to write file '%s': fwrite() failed: %s"
msgstr "写入文件“%s”失败：fwrite() 失败：%s"
-#: ../glib/gfileutils.c:1097
+#: ../glib/gfileutils.c:1093
#, c-format
msgid "Failed to write file '%s': fflush() failed: %s"
msgstr "写入文件“%s”失败：fflush() 失败：%s"
-#: ../glib/gfileutils.c:1141
+#: ../glib/gfileutils.c:1137
#, c-format
msgid "Failed to write file '%s': fsync() failed: %s"
msgstr "写入文件“%s”失败：fsync() 失败：%s"
-#: ../glib/gfileutils.c:1165
+#: ../glib/gfileutils.c:1161
#, c-format
msgid "Failed to close file '%s': fclose() failed: %s"
msgstr "关闭文件“%s”失败：fclose() 失败：%s"
-#: ../glib/gfileutils.c:1287
+#: ../glib/gfileutils.c:1282
#, c-format
msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
msgstr "无法删除已有文件“%s”：g_unlink() 失败：%s"
-#: ../glib/gfileutils.c:1547
+#: ../glib/gfileutils.c:1556
#, c-format
msgid "Template '%s' invalid, should not contain a '%s'"
msgstr "模板“%s”无效，不应该包含“%s”"
-#: ../glib/gfileutils.c:1560
+#: ../glib/gfileutils.c:1569
#, c-format
msgid "Template '%s' doesn't contain XXXXXX"
msgstr "模板“%s”不包含 XXXXXX"
-#: ../glib/gfileutils.c:2088
+#: ../glib/gfileutils.c:2097
#, c-format
msgid "Failed to read the symbolic link '%s': %s"
msgstr "读取符号链接“%s”失败：%s"
-#: ../glib/gfileutils.c:2109
+#: ../glib/gfileutils.c:2118
msgid "Symbolic links not supported"
msgstr "不支持符号链接"
-#: ../glib/giochannel.c:1415
+#: ../glib/giochannel.c:1418
#, c-format
msgid "Could not open converter from '%s' to '%s': %s"
msgstr "无法打开从“%s”到“%s”的转换器：%s"
-#: ../glib/giochannel.c:1760
+#: ../glib/giochannel.c:1763
msgid "Can't do a raw read in g_io_channel_read_line_string"
msgstr "g_io_channel_read_line_string 函数无法进行原始读取"
-#: ../glib/giochannel.c:1807 ../glib/giochannel.c:2064
-#: ../glib/giochannel.c:2151
+#: ../glib/giochannel.c:1810 ../glib/giochannel.c:2068
+#: ../glib/giochannel.c:2155
msgid "Leftover unconverted data in read buffer"
msgstr "在读缓冲里留有未转换数据"
-#: ../glib/giochannel.c:1888 ../glib/giochannel.c:1965
+#: ../glib/giochannel.c:1891 ../glib/giochannel.c:1968
msgid "Channel terminates in a partial character"
msgstr "通道终止于未尽字符"
-#: ../glib/giochannel.c:1951
+#: ../glib/giochannel.c:1954
msgid "Can't do a raw read in g_io_channel_read_to_end"
msgstr "g_io_channel_read_to_end 函数无法进行原始读取"
-#: ../glib/gkeyfile.c:726
+#: ../glib/gkeyfile.c:722
msgid "Valid key file could not be found in search dirs"
msgstr "在搜索目录中无法找到有效的键文件"
-#: ../glib/gkeyfile.c:762
+#: ../glib/gkeyfile.c:758
msgid "Not a regular file"
msgstr "不是普通文件"
-#: ../glib/gkeyfile.c:1162
+#: ../glib/gkeyfile.c:1158
#, c-format
msgid ""
"Key file contains line '%s' which is not a key-value pair, group, or comment"
msgstr "键文件中的行“%s”不是键-值对、组或注释"
-#: ../glib/gkeyfile.c:1222
+#: ../glib/gkeyfile.c:1215
#, c-format
msgid "Invalid group name: %s"
msgstr "无效的组名：%s"
-#: ../glib/gkeyfile.c:1244
+#: ../glib/gkeyfile.c:1237
msgid "Key file does not start with a group"
msgstr "键文件不以组开始"
-#: ../glib/gkeyfile.c:1270
+#: ../glib/gkeyfile.c:1263
#, c-format
msgid "Invalid key name: %s"
msgstr "无效的键名：%s"
-#: ../glib/gkeyfile.c:1297
+#: ../glib/gkeyfile.c:1290
#, c-format
msgid "Key file contains unsupported encoding '%s'"
msgstr "键文件包含不支持的编码“%s”"
-#: ../glib/gkeyfile.c:1541 ../glib/gkeyfile.c:1703 ../glib/gkeyfile.c:3081
-#: ../glib/gkeyfile.c:3147 ../glib/gkeyfile.c:3273 ../glib/gkeyfile.c:3406
-#: ../glib/gkeyfile.c:3548 ../glib/gkeyfile.c:3778 ../glib/gkeyfile.c:3846
+#: ../glib/gkeyfile.c:1533 ../glib/gkeyfile.c:1695 ../glib/gkeyfile.c:3073
+#: ../glib/gkeyfile.c:3139 ../glib/gkeyfile.c:3265 ../glib/gkeyfile.c:3398
+#: ../glib/gkeyfile.c:3540 ../glib/gkeyfile.c:3770 ../glib/gkeyfile.c:3837
#, c-format
msgid "Key file does not have group '%s'"
msgstr "键文件没有组“%s”"
-#: ../glib/gkeyfile.c:1715
+#: ../glib/gkeyfile.c:1707
#, c-format
msgid "Key file does not have key '%s'"
msgstr "键文件没有键“%s”"
-#: ../glib/gkeyfile.c:1822 ../glib/gkeyfile.c:1938
+#: ../glib/gkeyfile.c:1814 ../glib/gkeyfile.c:1930
#, c-format
msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
msgstr "键文件包含“%s”，其值“%s”不是 UTF-8"
-#: ../glib/gkeyfile.c:1842 ../glib/gkeyfile.c:1958 ../glib/gkeyfile.c:2327
+#: ../glib/gkeyfile.c:1834 ../glib/gkeyfile.c:1950 ../glib/gkeyfile.c:2319
#, c-format
msgid ""
"Key file contains key '%s' which has a value that cannot be interpreted."
msgstr "键文件包含键“%s”，其值无法解释。"
-#: ../glib/gkeyfile.c:2544 ../glib/gkeyfile.c:2910
+#: ../glib/gkeyfile.c:2536 ../glib/gkeyfile.c:2902
#, c-format
msgid ""
"Key file contains key '%s' in group '%s' which has a value that cannot be "
"interpreted."
msgstr "键文件中组“%2$s”的键“%1$s”有一个无法解释的值。"
-#: ../glib/gkeyfile.c:2622 ../glib/gkeyfile.c:2698
+#: ../glib/gkeyfile.c:2614 ../glib/gkeyfile.c:2690
#, c-format
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:3096 ../glib/gkeyfile.c:3288 ../glib/gkeyfile.c:3857
+#: ../glib/gkeyfile.c:3088 ../glib/gkeyfile.c:3280 ../glib/gkeyfile.c:3848
#, c-format
msgid "Key file does not have key '%s' in group '%s'"
msgstr "键文件的组“%2$s”中不包含键“%1$s”"
-#: ../glib/gkeyfile.c:4089
+#: ../glib/gkeyfile.c:4080
msgid "Key file contains escape character at end of line"
msgstr "键文件在行尾含有转义字符"
-#: ../glib/gkeyfile.c:4111
+#: ../glib/gkeyfile.c:4102
#, c-format
msgid "Key file contains invalid escape sequence '%s'"
msgstr "键文件中包含无效的转义序列“%s”"
-#: ../glib/gkeyfile.c:4253
+#: ../glib/gkeyfile.c:4244
#, c-format
msgid "Value '%s' cannot be interpreted as a number."
msgstr "无法将值“%s”解释为数值。"
-#: ../glib/gkeyfile.c:4267
+#: ../glib/gkeyfile.c:4258
#, c-format
msgid "Integer value '%s' out of range"
msgstr "整数值“%s”超出范围"
-#: ../glib/gkeyfile.c:4300
+#: ../glib/gkeyfile.c:4291
#, c-format
msgid "Value '%s' cannot be interpreted as a float number."
msgstr "无法将值“%s”解释为浮点数。"
-#: ../glib/gkeyfile.c:4324
+#: ../glib/gkeyfile.c:4315
#, c-format
msgid "Value '%s' cannot be interpreted as a boolean."
msgstr "无法将值“%s”解释为布尔值。"
-#: ../glib/gmappedfile.c:128
+#: ../glib/gmappedfile.c:130
#, c-format
msgid "Failed to get attributes of file '%s%s%s%s': fstat() failed: %s"
msgstr "获取文件“%s%s%s%s”的属性失败 : fstat() 失败：%s"
-#: ../glib/gmappedfile.c:194
+#: ../glib/gmappedfile.c:196
#, c-format
msgid "Failed to map %s%s%s%s: mmap() failed: %s"
msgstr "映射 %s%s%s%s 失败：mmap() 失败：%s"
-#: ../glib/gmappedfile.c:260
+#: ../glib/gmappedfile.c:262
#, c-format
msgid "Failed to open file '%s': open() failed: %s"
msgstr "打开文件“%s”失败：open() 失败：%s"
-#: ../glib/gmarkup.c:356 ../glib/gmarkup.c:397
+#: ../glib/gmarkup.c:397 ../glib/gmarkup.c:439
#, c-format
msgid "Error on line %d char %d: "
msgstr "第 %d 行第 %d 个字符出错："
-#: ../glib/gmarkup.c:419 ../glib/gmarkup.c:502
+#: ../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:430
+#: ../glib/gmarkup.c:472
#, c-format
-msgid "'%s' is not a valid name "
+msgid "'%s' is not a valid name"
msgstr "“%s”不是有效的名称"
-#: ../glib/gmarkup.c:446
+#: ../glib/gmarkup.c:488
#, c-format
-msgid "'%s' is not a valid name: '%c' "
+msgid "'%s' is not a valid name: '%c'"
msgstr "“%s”不是有效的名称：“%c”"
-#: ../glib/gmarkup.c:555
+#: ../glib/gmarkup.c:598
#, c-format
msgid "Error on line %d: %s"
msgstr "第 %d 行出错：%s"
-#: ../glib/gmarkup.c:639
+#: ../glib/gmarkup.c:682
#, c-format
msgid ""
"Failed to parse '%-.*s', which should have been a digit inside a character "
@@ -3354,7 +3441,7 @@ msgid ""
msgstr ""
"解析“%-.*s”失败。它应该是字符引用中的数字(如 ê) - 可能该数字太大了"
-#: ../glib/gmarkup.c:651
+#: ../glib/gmarkup.c:694
msgid ""
"Character reference did not end with a semicolon; most likely you used an "
"ampersand character without intending to start an entity - escape ampersand "
@@ -3363,22 +3450,22 @@ msgstr ""
"字符引用没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变"
"为 &"
-#: ../glib/gmarkup.c:677
+#: ../glib/gmarkup.c:720
#, c-format
msgid "Character reference '%-.*s' does not encode a permitted character"
msgstr "字符引用“%-.*s”不是编码一个被允许的字符"
-#: ../glib/gmarkup.c:715
+#: ../glib/gmarkup.c:758
msgid ""
"Empty entity '&;' seen; valid entities are: & " < > '"
msgstr "发现空的实体“&;”。有效的实体为：& " < > '"
-#: ../glib/gmarkup.c:723
+#: ../glib/gmarkup.c:766
#, c-format
msgid "Entity name '%-.*s' is not known"
msgstr "未知的实体名“%-.*s”"
-#: ../glib/gmarkup.c:728
+#: ../glib/gmarkup.c:771
msgid ""
"Entity did not end with a semicolon; most likely you used an ampersand "
"character without intending to start an entity - escape ampersand as &"
@@ -3386,31 +3473,31 @@ msgstr ""
"实体没有以分号结束。很可能您使用了 & 字符而又不是一个实体 - 将这个 & 变为 "
"&"
-#: ../glib/gmarkup.c:1076
+#: ../glib/gmarkup.c:1119
msgid "Document must begin with an element (e.g. <book>)"
msgstr "文档必须以一个元素开始(例如 <book>)"
-#: ../glib/gmarkup.c:1116
+#: ../glib/gmarkup.c:1159
#, c-format
msgid ""
"'%s' is not a valid character following a '<' character; it may not begin an "
"element name"
msgstr "“%s”出现在字符“<”后是无效字符；它不能作为元素名的开头"
-#: ../glib/gmarkup.c:1184
+#: ../glib/gmarkup.c:1227
#, c-format
msgid ""
-"Odd character '%s', expected a '>' character to end the empty-element tag '%"
-"s'"
+"Odd character '%s', expected a '>' character to end the empty-element tag "
+"'%s'"
msgstr "字符“%s”无效，应该以字符“>”来结束空元素标记“%s”"
-#: ../glib/gmarkup.c:1268
+#: ../glib/gmarkup.c:1311
#, c-format
msgid ""
"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr "字符“%s”无效，在属性名“%s”(元素“%s”)的后应该是字符“=”"
-#: ../glib/gmarkup.c:1309
+#: ../glib/gmarkup.c:1352
#, c-format
msgid ""
"Odd character '%s', expected a '>' or '/' character to end the start tag of "
@@ -3420,558 +3507,634 @@ msgstr ""
"字符“%s”无效，应该以“>”或“/”结束元素“%s”的起始标记，或紧跟该元素的属性；可能"
"您在属性名中使用了无效字符"
-#: ../glib/gmarkup.c:1353
+#: ../glib/gmarkup.c:1396
#, 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:1486
+#: ../glib/gmarkup.c:1529
#, 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:1522
+#: ../glib/gmarkup.c:1565
#, 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:1533
+#: ../glib/gmarkup.c:1576
#, c-format
msgid "Element '%s' was closed, no element is currently open"
msgstr "元素“%s”已经结束，没有未结束的元素"
-#: ../glib/gmarkup.c:1542
+#: ../glib/gmarkup.c:1585
#, c-format
msgid "Element '%s' was closed, but the currently open element is '%s'"
msgstr "元素“%s”已经结束，当前未结束的元素是“%s”"
-#: ../glib/gmarkup.c:1710
+#: ../glib/gmarkup.c:1753
msgid "Document was empty or contained only whitespace"
msgstr "文档为空或仅含空白字符"
-#: ../glib/gmarkup.c:1724
+#: ../glib/gmarkup.c:1767
msgid "Document ended unexpectedly just after an open angle bracket '<'"
msgstr "文档在一个打开的尖括号“<”后意外结束"
-#: ../glib/gmarkup.c:1732 ../glib/gmarkup.c:1777
+#: ../glib/gmarkup.c:1775 ../glib/gmarkup.c:1820
#, c-format
msgid ""
"Document ended unexpectedly with elements still open - '%s' was the last "
"element opened"
msgstr "文档在还存在未结束元素时意外结束 - 最后的未结束元素是“%s”"
-#: ../glib/gmarkup.c:1740
+#: ../glib/gmarkup.c:1783
#, c-format
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
"the tag <%s/>"
msgstr "文档意外结束，应该以右尖括号“>”来结束标记 <%s/>"
-#: ../glib/gmarkup.c:1746
+#: ../glib/gmarkup.c:1789
msgid "Document ended unexpectedly inside an element name"
msgstr "文档在元素名中意外结束"
-#: ../glib/gmarkup.c:1752
+#: ../glib/gmarkup.c:1795
msgid "Document ended unexpectedly inside an attribute name"
msgstr "文档在属性名中意外结束"
-#: ../glib/gmarkup.c:1757
+#: ../glib/gmarkup.c:1800
msgid "Document ended unexpectedly inside an element-opening tag."
msgstr "文档在元素起始标记中意外结束"
-#: ../glib/gmarkup.c:1763
+#: ../glib/gmarkup.c:1806
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
msgstr "文档在跟在属性名后的等号后意外结束；没有属性值"
-#: ../glib/gmarkup.c:1770
+#: ../glib/gmarkup.c:1813
msgid "Document ended unexpectedly while inside an attribute value"
msgstr "文档在属性值中意外结束"
-#: ../glib/gmarkup.c:1786
+#: ../glib/gmarkup.c:1829
#, c-format
msgid "Document ended unexpectedly inside the close tag for element '%s'"
msgstr "文档在元素“%s”结束标记中意外结束"
-#: ../glib/gmarkup.c:1792
+#: ../glib/gmarkup.c:1835
msgid "Document ended unexpectedly inside a comment or processing instruction"
msgstr "文档在注释或处理指令中意外结束"
-#: ../glib/goption.c:746
+#: ../glib/goption.c:754
msgid "Usage:"
msgstr "用法："
-#: ../glib/goption.c:746
+#: ../glib/goption.c:754
msgid "[OPTION...]"
msgstr "[选项...]"
-#: ../glib/goption.c:852
+#: ../glib/goption.c:864
msgid "Help Options:"
msgstr "帮助选项："
-#: ../glib/goption.c:853
+#: ../glib/goption.c:865
msgid "Show help options"
msgstr "显示帮助选项"
-#: ../glib/goption.c:859
+#: ../glib/goption.c:871
msgid "Show all help options"
msgstr "显示全部帮助选项"
-#: ../glib/goption.c:921
+#: ../glib/goption.c:933
msgid "Application Options:"
msgstr "应用程序选项："
-#: ../glib/goption.c:983 ../glib/goption.c:1053
+#: ../glib/goption.c:997 ../glib/goption.c:1067
#, c-format
msgid "Cannot parse integer value '%s' for %s"
msgstr "无法处理 %2$s 所用的整数值“%1$s”"
-#: ../glib/goption.c:993 ../glib/goption.c:1061
+#: ../glib/goption.c:1007 ../glib/goption.c:1075
#, c-format
msgid "Integer value '%s' for %s out of range"
msgstr "%2$s 所用的整数值“%1$s”超出范围"
-#: ../glib/goption.c:1018
+#: ../glib/goption.c:1032
#, c-format
msgid "Cannot parse double value '%s' for %s"
msgstr "无法处理 %2$s 所用的双精度值“%1$s”"
-#: ../glib/goption.c:1026
+#: ../glib/goption.c:1040
#, c-format
msgid "Double value '%s' for %s out of range"
msgstr "%2$s 所用的双精度值“%1$s”超出范围"
-#: ../glib/goption.c:1289 ../glib/goption.c:1368
+#: ../glib/goption.c:1303 ../glib/goption.c:1382
#, c-format
msgid "Error parsing option %s"
msgstr "解析选项 %s 时出错"
-#: ../glib/goption.c:1399 ../glib/goption.c:1512
+#: ../glib/goption.c:1413 ../glib/goption.c:1526
#, c-format
msgid "Missing argument for %s"
msgstr "缺少 %s 的参数"
-#: ../glib/goption.c:1965
+#: ../glib/goption.c:1979
#, c-format
msgid "Unknown option %s"
msgstr "未知选项 %s"
-#: ../glib/gregex.c:190
+#: ../glib/gregex.c:257
msgid "corrupted object"
msgstr "无效对象"
-#: ../glib/gregex.c:192
+#: ../glib/gregex.c:259
msgid "internal error or corrupted object"
msgstr "内部错误或者无效对象"
-#: ../glib/gregex.c:194
+#: ../glib/gregex.c:261
msgid "out of memory"
msgstr "内存不足"
-#: ../glib/gregex.c:199
+#: ../glib/gregex.c:266
msgid "backtracking limit reached"
msgstr "达到回溯上限"
-#: ../glib/gregex.c:211 ../glib/gregex.c:219
+#: ../glib/gregex.c:278 ../glib/gregex.c:286
msgid "the pattern contains items not supported for partial matching"
msgstr "表达式包含不被部分匹配支持的项"
-#: ../glib/gregex.c:221
+#: ../glib/gregex.c:288
msgid "back references as conditions are not supported for partial matching"
msgstr "不完全匹配时作为条件的后向引用不被支持."
-#: ../glib/gregex.c:230
+#: ../glib/gregex.c:297
msgid "recursion limit reached"
msgstr "达到递归上限"
-#: ../glib/gregex.c:232
-msgid "workspace limit for empty substrings reached"
-msgstr "达到空子串的工作空间限制"
-
-#: ../glib/gregex.c:234
+#: ../glib/gregex.c:299
msgid "invalid combination of newline flags"
msgstr "无效的新行标志组合."
-#: ../glib/gregex.c:236
+#: ../glib/gregex.c:301
msgid "bad offset"
msgstr "错误的偏移值"
-#: ../glib/gregex.c:238
+#: ../glib/gregex.c:303
msgid "short utf8"
msgstr "UTF-8 短编码"
-#: ../glib/gregex.c:242
+#: ../glib/gregex.c:305
+msgid "recursion loop"
+msgstr "递归循环"
+
+#: ../glib/gregex.c:309
msgid "unknown error"
msgstr "未知错误"
-#: ../glib/gregex.c:262
+#: ../glib/gregex.c:329
msgid "\\ at end of pattern"
msgstr "表达式末尾的 \\"
-#: ../glib/gregex.c:265
+#: ../glib/gregex.c:332
msgid "\\c at end of pattern"
msgstr "表达式末尾的 \\c"
-#: ../glib/gregex.c:268
-msgid "unrecognized character follows \\"
+#: ../glib/gregex.c:335
+msgid "unrecognized character following \\"
msgstr "无法识别 \\ 后的字符"
-#: ../glib/gregex.c:275
-msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
-msgstr "这里不允许使用改变大小写的转义符(\\l, \\L, \\u, \\U)"
-
-#: ../glib/gregex.c:278
+#: ../glib/gregex.c:338
msgid "numbers out of order in {} quantifier"
msgstr "{} 里的数字次序颠倒了"
-#: ../glib/gregex.c:281
+#: ../glib/gregex.c:341
msgid "number too big in {} quantifier"
msgstr "{} 里的数字太大了"
-#: ../glib/gregex.c:284
+#: ../glib/gregex.c:344
msgid "missing terminating ] for character class"
msgstr "字符类缺少终结的 ]"
-#: ../glib/gregex.c:287
+#: ../glib/gregex.c:347
msgid "invalid escape sequence in character class"
msgstr "字符类包含无效的转义序列"
-#: ../glib/gregex.c:290
+#: ../glib/gregex.c:350
msgid "range out of order in character class"
msgstr "字符类的范围次序颠倒"
-#: ../glib/gregex.c:293
+#: ../glib/gregex.c:353
msgid "nothing to repeat"
msgstr "没有可以重复的内容"
-#: ../glib/gregex.c:296
-msgid "unrecognized character after (?"
-msgstr "(? 后有无法识别的字符"
-
-#: ../glib/gregex.c:300
-msgid "unrecognized character after (?<"
-msgstr "(?< 后有无法识别的字符"
+#: ../glib/gregex.c:357
+msgid "unexpected repeat"
+msgstr "非预期的重复"
-#: ../glib/gregex.c:304
-msgid "unrecognized character after (?P"
-msgstr "(?P 有无法识别的字符"
+#: ../glib/gregex.c:360
+msgid "unrecognized character after (? or (?-"
+msgstr "(? 或 (?- 后有无法识别的字符"
-#: ../glib/gregex.c:307
+#: ../glib/gregex.c:363
msgid "POSIX named classes are supported only within a class"
msgstr "只有类里支持 POSIX 命名的类"
-#: ../glib/gregex.c:310
+#: ../glib/gregex.c:366
msgid "missing terminating )"
msgstr "缺少结束的 )"
-#: ../glib/gregex.c:314
-msgid ") without opening ("
-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:321
-msgid "(?R or (?[+-]digits must be followed by )"
-msgstr "(?R 或 (?[+-]数字 必须跟着 )"
-
-#: ../glib/gregex.c:324
+#: ../glib/gregex.c:369
msgid "reference to non-existent subpattern"
msgstr "引用了不存在的子表达式"
-#: ../glib/gregex.c:327
+#: ../glib/gregex.c:372
msgid "missing ) after comment"
msgstr "注释后缺少 )"
-#: ../glib/gregex.c:330
-msgid "regular expression too large"
+#: ../glib/gregex.c:375
+msgid "regular expression is too large"
msgstr "正则表达式过长"
-#: ../glib/gregex.c:333
+#: ../glib/gregex.c:378
msgid "failed to get memory"
msgstr "获取内存失败"
-#: ../glib/gregex.c:336
+#: ../glib/gregex.c:382
+msgid ") without opening ("
+msgstr ") 没有开始的 ("
+
+#: ../glib/gregex.c:386
+msgid "code overflow"
+msgstr "代码溢出"
+
+#: ../glib/gregex.c:390
+msgid "unrecognized character after (?<"
+msgstr "(?< 后有无法识别的字符"
+
+#: ../glib/gregex.c:393
msgid "lookbehind assertion is not fixed length"
msgstr "lookbehind 断言不是定长的"
-#: ../glib/gregex.c:339
+#: ../glib/gregex.c:396
msgid "malformed number or name after (?("
msgstr "(?( 后有形式不正确的数字或名称"
-#: ../glib/gregex.c:342
+#: ../glib/gregex.c:399
msgid "conditional group contains more than two branches"
msgstr "条件组包含了超过两个分支"
-#: ../glib/gregex.c:345
+#: ../glib/gregex.c:402
msgid "assertion expected after (?("
msgstr "(?( 后应该有断言"
-#: ../glib/gregex.c:348
+#. translators: '(?R' and '(?[+-]digits' are both meant as (groups of)
+#. * sequences here, '(?-54' would be an example for the second group.
+#.
+#: ../glib/gregex.c:409
+msgid "(?R or (?[+-]digits must be followed by )"
+msgstr "(?R 或 (?[+-]数字 必须跟着 )"
+
+#: ../glib/gregex.c:412
msgid "unknown POSIX class name"
msgstr "未知的 POSIX 类名"
-#: ../glib/gregex.c:351
+#: ../glib/gregex.c:415
msgid "POSIX collating elements are not supported"
msgstr "不支持 POSIX 整理元素"
-#: ../glib/gregex.c:354
+#: ../glib/gregex.c:418
msgid "character value in \\x{...} sequence is too large"
msgstr "\\x{...} 序列里的字符值太大了"
-#: ../glib/gregex.c:357
+#: ../glib/gregex.c:421
msgid "invalid condition (?(0)"
msgstr "无效的条件 (?(0)"
-#: ../glib/gregex.c:360
+#: ../glib/gregex.c:424
msgid "\\C not allowed in lookbehind assertion"
msgstr "lookbehind 断言里不允许使用 \\C"
-#: ../glib/gregex.c:363
+#: ../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:434
msgid "recursive call could loop indefinitely"
msgstr "递归调用可能导致无限循环"
-#: ../glib/gregex.c:366
+#: ../glib/gregex.c:438
+msgid "unrecognized character after (?P"
+msgstr "(?P 有无法识别的字符"
+
+#: ../glib/gregex.c:441
msgid "missing terminator in subpattern name"
msgstr "子表达式名里缺少终结符"
-#: ../glib/gregex.c:369
+#: ../glib/gregex.c:444
msgid "two named subpatterns have the same name"
msgstr "两个有名子表达式有相同的名称"
-#: ../glib/gregex.c:372
+#: ../glib/gregex.c:447
msgid "malformed \\P or \\p sequence"
msgstr "形式不正确的 \\P 或 \\p 序列"
-#: ../glib/gregex.c:375
+#: ../glib/gregex.c:450
msgid "unknown property name after \\P or \\p"
msgstr "\\P 或 \\p 后有未知的属性名"
-#: ../glib/gregex.c:378
+#: ../glib/gregex.c:453
msgid "subpattern name is too long (maximum 32 characters)"
msgstr "子表达式名太长了(最多32个字符)"
-#: ../glib/gregex.c:381
+#: ../glib/gregex.c:456
msgid "too many named subpatterns (maximum 10,000)"
msgstr "有名子表达式太多了(最多10,000个)"
-#: ../glib/gregex.c:384
+#: ../glib/gregex.c:459
msgid "octal value is greater than \\377"
msgstr "八进制值大于 \\377"
-#: ../glib/gregex.c:387
+#: ../glib/gregex.c:463
+msgid "overran compiling workspace"
+msgstr "编译工作区超出正常范围"
+
+#: ../glib/gregex.c:467
+msgid "previously-checked referenced subpattern not found"
+msgstr "未找到之前检查过的引用过的子表达式"
+
+#: ../glib/gregex.c:470
msgid "DEFINE group contains more than one branch"
msgstr "DEFINE 组包含多于一个分支"
-#: ../glib/gregex.c:390
-msgid "repeating a DEFINE group is not allowed"
-msgstr "不允许重复 DEFINE 组"
-
-#: ../glib/gregex.c:393
+#: ../glib/gregex.c:473
msgid "inconsistent NEWLINE options"
msgstr "不一致的 NEWLINE 选项"
-#: ../glib/gregex.c:396
+#: ../glib/gregex.c:476
msgid ""
-"\\g is not followed by a braced name or an optionally braced non-zero number"
-msgstr "\\g 后没有花括号括起来的名称或可选的花括号括起来的非零数字"
+"\\g is not followed by a braced, angle-bracketed, or quoted name or number, "
+"or by a plain number"
+msgstr "\\g 后没有花括号、尖括号或引号括起来的名称或数字，或纯数字"
-#: ../glib/gregex.c:401
-msgid "unexpected repeat"
-msgstr "非预期的重复"
+#: ../glib/gregex.c:480
+msgid "a numbered reference must not be zero"
+msgstr "编号引用不能为0"
-#: ../glib/gregex.c:405
-msgid "code overflow"
-msgstr "代码溢出"
+#: ../glib/gregex.c:483
+msgid "an argument is not allowed for (*ACCEPT), (*FAIL), or (*COMMIT)"
+msgstr "(*ACCEPT), (*FAIL) 和 (*COMMIT) 不允许带参数"
-#: ../glib/gregex.c:409
-msgid "overran compiling workspace"
-msgstr "编译工作区超出正常范围"
+#: ../glib/gregex.c:486
+msgid "(*VERB) not recognized"
+msgstr "无法识别 (*VERB)"
-#: ../glib/gregex.c:413
-msgid "previously-checked referenced subpattern not found"
-msgstr "未找到之前检查过的引用过的子表达式"
+#: ../glib/gregex.c:489
+msgid "number is too big"
+msgstr "数字太大"
-#: ../glib/gregex.c:631 ../glib/gregex.c:1753
+#: ../glib/gregex.c:492
+msgid "missing subpattern name after (?&"
+msgstr "(?& 后缺少子表达式名"
+
+#: ../glib/gregex.c:495
+msgid "digit expected after (?+"
+msgstr "(?+ 后应为数字"
+
+#: ../glib/gregex.c:498
+msgid "] is an invalid data character in JavaScript compatibility mode"
+msgstr "Javascript 兼容模式中，] 是非法数据字符"
+
+#: ../glib/gregex.c:501
+msgid "different names for subpatterns of the same number are not allowed"
+msgstr "不允许两个号码相同的子表达式有不同的名称"
+
+#: ../glib/gregex.c:504
+msgid "(*MARK) must have an argument"
+msgstr "(*MARK) 必须有一个参数"
+
+#: ../glib/gregex.c:507
+msgid "\\c must be followed by an ASCII character"
+msgstr "\\c 后面必须跟一个 ASCII 字符"
+
+#: ../glib/gregex.c:510
+msgid "\\k is not followed by a braced, angle-bracketed, or quoted name"
+msgstr "\\k 后没有用花括号、尖括号或引号括起来的名称"
+
+#: ../glib/gregex.c:513
+msgid "\\N is not supported in a class"
+msgstr "类中不支持 \\N"
+
+#: ../glib/gregex.c:516
+msgid "too many forward references"
+msgstr "太多前向引用"
+
+#: ../glib/gregex.c:519
+msgid "name is too long in (*MARK), (*PRUNE), (*SKIP), or (*THEN)"
+msgstr "在 (*MARK), (*PRUNE), (*SKIP) 或者 (*THEN) 中名字太长"
+
+#: ../glib/gregex.c:522
+msgid "character value in \\u.... sequence is too large"
+msgstr "\\u.... 序列里的字符值太大了"
+
+#: ../glib/gregex.c:745 ../glib/gregex.c:1899
#, c-format
msgid "Error while matching regular expression %s: %s"
msgstr "匹配正则表达式 %s 出现错误：%s"
-#: ../glib/gregex.c:1206
+#: ../glib/gregex.c:1319
msgid "PCRE library is compiled without UTF8 support"
msgstr "PCRE 库编译时未包含 UTF8 支持"
-#: ../glib/gregex.c:1215
+#: ../glib/gregex.c:1323
msgid "PCRE library is compiled without UTF8 properties support"
msgstr "PCRE 库编译时未包含 UTF8 属性支持"
-#: ../glib/gregex.c:1271
+#: ../glib/gregex.c:1331
+msgid "PCRE library is compiled with incompatible options"
+msgstr "PCRE 库编译时使用了不兼容的选项"
+
+#: ../glib/gregex.c:1390
#, c-format
msgid "Error while compiling regular expression %s at char %d: %s"
msgstr "编译正则表达式 %s (于字符 %d 处)时出错：%s"
-#: ../glib/gregex.c:1307
+#: ../glib/gregex.c:1432
#, c-format
msgid "Error while optimizing regular expression %s: %s"
msgstr "优化正则表达式 %s 时出错：%s"
-#: ../glib/gregex.c:2182
+#: ../glib/gregex.c:2331
msgid "hexadecimal digit or '}' expected"
msgstr "期望十六进制数或 '}'"
-#: ../glib/gregex.c:2198
+#: ../glib/gregex.c:2347
msgid "hexadecimal digit expected"
msgstr "期望十六进制数"
-#: ../glib/gregex.c:2238
+#: ../glib/gregex.c:2387
msgid "missing '<' in symbolic reference"
msgstr "在符号引用中缺少“<”"
-#: ../glib/gregex.c:2247
+#: ../glib/gregex.c:2396
msgid "unfinished symbolic reference"
msgstr "未完成的符号引用"
-#: ../glib/gregex.c:2254
+#: ../glib/gregex.c:2403
msgid "zero-length symbolic reference"
msgstr "零长符号引用"
-#: ../glib/gregex.c:2265
+#: ../glib/gregex.c:2414
msgid "digit expected"
msgstr "期望数字"
-#: ../glib/gregex.c:2283
+#: ../glib/gregex.c:2432
msgid "illegal symbolic reference"
msgstr "非法的符号引用"
-#: ../glib/gregex.c:2345
+#: ../glib/gregex.c:2494
msgid "stray final '\\'"
msgstr "丢失了最后的“\\”"
-#: ../glib/gregex.c:2349
+#: ../glib/gregex.c:2498
msgid "unknown escape sequence"
msgstr "未知的转义序列"
-#: ../glib/gregex.c:2359
+#: ../glib/gregex.c:2508
#, c-format
msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
msgstr "分析替换文本\"%s\" 时在字符 %lu 处发生错误：%s"
-#: ../glib/gshell.c:91
+#: ../glib/gshell.c:88
msgid "Quoted text doesn't begin with a quotation mark"
msgstr "引用的文本没有以引号开头"
-#: ../glib/gshell.c:181
+#: ../glib/gshell.c:178
msgid "Unmatched quotation mark in command line or other shell-quoted text"
msgstr "命令行或其他 shell 引用文本中出现不匹配的引号"
-#: ../glib/gshell.c:559
+#: ../glib/gshell.c:574
#, c-format
msgid "Text ended just after a '\\' character. (The text was '%s')"
msgstr "文本在一个“\\”字符后结束。(文本为“%s”)"
-#: ../glib/gshell.c:566
+#: ../glib/gshell.c:581
#, c-format
msgid "Text ended before matching quote was found for %c. (The text was '%s')"
msgstr "文本在找到与 %c 匹配的引号之前结束。(文本为“%s”)"
-#: ../glib/gshell.c:578
+#: ../glib/gshell.c:593
msgid "Text was empty (or contained only whitespace)"
msgstr "文本为空(或仅含空白字符)"
-#: ../glib/gspawn.c:208
+#: ../glib/gspawn.c:203
#, c-format
msgid "Failed to read data from child process (%s)"
msgstr "从子进程中读取数据失败(%s)"
-#: ../glib/gspawn.c:348
+#: ../glib/gspawn.c:362
#, c-format
msgid "Unexpected error in select() reading data from a child process (%s)"
msgstr "select() 在从子进程中读取数据时出现异常错误 (%s)"
-#: ../glib/gspawn.c:433
+#: ../glib/gspawn.c:853 ../glib/gspawn-win32.c:1233
+#, c-format
+msgid "Child process exited with code %ld"
+msgstr "子进程退出，代码 %ld"
+
+#: ../glib/gspawn.c:861
#, c-format
-msgid "Unexpected error in waitpid() (%s)"
-msgstr "waitpid() 出现异常错误 (%s)"
+msgid "Child process killed by signal %ld"
+msgstr "子进程已由信号 %ld 杀死"
-#: ../glib/gspawn.c:1174 ../glib/gspawn-win32.c:338 ../glib/gspawn-win32.c:346
+#: ../glib/gspawn.c:868
+#, c-format
+msgid "Child process stopped by signal %ld"
+msgstr "子进程已由信号 %ld 停止"
+
+#: ../glib/gspawn.c:875
+#, c-format
+msgid "Child process exited abnormally"
+msgstr "子进程异常中止"
+
+#: ../glib/gspawn.c:1280 ../glib/gspawn-win32.c:339 ../glib/gspawn-win32.c:347
#, c-format
msgid "Failed to read from child pipe (%s)"
msgstr "从子管道中读取失败(%s)"
-#: ../glib/gspawn.c:1241
+#: ../glib/gspawn.c:1348
#, c-format
msgid "Failed to fork (%s)"
msgstr "fork 失败(%s)"
-#: ../glib/gspawn.c:1387 ../glib/gspawn-win32.c:369
+#: ../glib/gspawn.c:1496 ../glib/gspawn-win32.c:370
#, c-format
msgid "Failed to change to directory '%s' (%s)"
msgstr "更改到目录“%s”失败(%s)"
-#: ../glib/gspawn.c:1397
+#: ../glib/gspawn.c:1506
#, c-format
msgid "Failed to execute child process \"%s\" (%s)"
msgstr "执行子进程“%s”失败(%s)"
-#: ../glib/gspawn.c:1407
+#: ../glib/gspawn.c:1516
#, c-format
msgid "Failed to redirect output or input of child process (%s)"
msgstr "重定向子进程(%s)的输入或输出失败"
-#: ../glib/gspawn.c:1416
+#: ../glib/gspawn.c:1525
#, c-format
msgid "Failed to fork child process (%s)"
msgstr "fork 子进程失败 (%s)"
-#: ../glib/gspawn.c:1424
+#: ../glib/gspawn.c:1533
#, c-format
msgid "Unknown error executing child process \"%s\""
msgstr "执行子进程“%s”时出现未知错误"
-#: ../glib/gspawn.c:1448
+#: ../glib/gspawn.c:1557
#, c-format
msgid "Failed to read enough data from child pid pipe (%s)"
msgstr "从子进程管道中读取足够的数据失败(%s)"
-#: ../glib/gspawn.c:1521 ../glib/gspawn-win32.c:299
+#: ../glib/gspawn.c:1630 ../glib/gspawn-win32.c:300
#, c-format
msgid "Failed to create pipe for communicating with child process (%s)"
msgstr "创建与子进程通讯的管道失败(%s)"
-#: ../glib/gspawn-win32.c:282
+#: ../glib/gspawn-win32.c:283
msgid "Failed to read data from child process"
msgstr "从子进程中读取数据失败"
-#: ../glib/gspawn-win32.c:375 ../glib/gspawn-win32.c:494
+#: ../glib/gspawn-win32.c:376 ../glib/gspawn-win32.c:495
#, c-format
msgid "Failed to execute child process (%s)"
msgstr "执行子进程失败(%s)"
-#: ../glib/gspawn-win32.c:444
+#: ../glib/gspawn-win32.c:445
#, c-format
msgid "Invalid program name: %s"
msgstr "无效的程序名：%s"
-#: ../glib/gspawn-win32.c:454 ../glib/gspawn-win32.c:722
-#: ../glib/gspawn-win32.c:1278
+#: ../glib/gspawn-win32.c:455 ../glib/gspawn-win32.c:722
+#: ../glib/gspawn-win32.c:1297
#, c-format
msgid "Invalid string in argument vector at %d: %s"
msgstr "%d 处的参数中有无效的字符串：%s"
-#: ../glib/gspawn-win32.c:465 ../glib/gspawn-win32.c:737
-#: ../glib/gspawn-win32.c:1311
+#: ../glib/gspawn-win32.c:466 ../glib/gspawn-win32.c:737
+#: ../glib/gspawn-win32.c:1330
#, c-format
msgid "Invalid string in environment: %s"
msgstr "环境中有无效的字符串：%s"
-#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1259
+#: ../glib/gspawn-win32.c:718 ../glib/gspawn-win32.c:1278
#, c-format
msgid "Invalid working directory: %s"
msgstr "无效的工作目录：%s"
@@ -4000,84 +4163,116 @@ msgstr "转换输入中出现无效序列"
msgid "Character out of range for UTF-16"
msgstr "字符超出 UTF-16 范围"
-#: ../glib/gutils.c:2166 ../glib/gutils.c:2193 ../glib/gutils.c:2297
+#: ../glib/gutils.c:2183 ../glib/gutils.c:2210 ../glib/gutils.c:2314
#, c-format
msgid "%u byte"
msgid_plural "%u bytes"
msgstr[0] "%u 字节"
-#: ../glib/gutils.c:2172
+#: ../glib/gutils.c:2189
#, c-format
msgid "%.1f KiB"
msgstr "%.1f KiB"
-#: ../glib/gutils.c:2174
+#: ../glib/gutils.c:2191
#, c-format
msgid "%.1f MiB"
msgstr "%.1f MiB"
-#: ../glib/gutils.c:2177
+#: ../glib/gutils.c:2194
#, c-format
msgid "%.1f GiB"
msgstr "%.1f GiB"
-#: ../glib/gutils.c:2180
+#: ../glib/gutils.c:2197
#, c-format
msgid "%.1f TiB"
msgstr "%.1f TiB"
-#: ../glib/gutils.c:2183
+#: ../glib/gutils.c:2200
#, c-format
msgid "%.1f PiB"
msgstr "%.1f PiB"
-#: ../glib/gutils.c:2186
+#: ../glib/gutils.c:2203
#, c-format
msgid "%.1f EiB"
msgstr "%.1f EiB"
-#: ../glib/gutils.c:2199
+#: ../glib/gutils.c:2216
#, c-format
msgid "%.1f kB"
msgstr "%.1f KB"
-#: ../glib/gutils.c:2202 ../glib/gutils.c:2310
+#: ../glib/gutils.c:2219 ../glib/gutils.c:2332
#, c-format
msgid "%.1f MB"
msgstr "%.1f MB"
-#: ../glib/gutils.c:2205 ../glib/gutils.c:2315
+#: ../glib/gutils.c:2222 ../glib/gutils.c:2337
#, c-format
msgid "%.1f GB"
msgstr "%.1f GB"
-#: ../glib/gutils.c:2207 ../glib/gutils.c:2320
+#: ../glib/gutils.c:2224 ../glib/gutils.c:2342
#, c-format
msgid "%.1f TB"
msgstr "%.1f TB"
-#: ../glib/gutils.c:2210 ../glib/gutils.c:2325
+#: ../glib/gutils.c:2227 ../glib/gutils.c:2347
#, c-format
msgid "%.1f PB"
msgstr "%.1f PB"
-#: ../glib/gutils.c:2213 ../glib/gutils.c:2330
+#: ../glib/gutils.c:2230 ../glib/gutils.c:2352
#, c-format
msgid "%.1f EB"
msgstr "%.1f EB"
#. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2250
+#: ../glib/gutils.c:2267
#, c-format
msgid "%s byte"
msgid_plural "%s bytes"
msgstr[0] "%s 字节"
-#: ../glib/gutils.c:2305
+#. Translators: this is from the deprecated function g_format_size_for_display() which uses 'KB' to
+#. * mean 1024 bytes. I am aware that 'KB' is not correct, but it has been preserved for reasons of
+#. * compatibility. Users will not see this string unless a program is using this deprecated function.
+#. * Please translate as literally as possible.
+#.
+#: ../glib/gutils.c:2327
#, c-format
msgid "%.1f KB"
msgstr "%.1f KB"
+#~ msgid "Abnormal program termination spawning command line `%s': %s"
+#~ msgstr "命令 %s 非正常程序终止：%s"
+
+#~ msgid "Command line `%s' exited with non-zero exit status %d: %s"
+#~ msgstr "命令 %s 以非零状态数 %d 退出：%s"
+
+#~ msgid "No service record for '%s'"
+#~ msgstr "没有“%s”的服务记录"
+
+#~ msgid ""
+#~ "Unexpected option length while checking if SO_PASSCRED is enabled for "
+#~ "socket. Expected %d bytes, got %d"
+#~ msgstr ""
+#~ "检查套接字是否启用 SO_PASSCRED 时选项长度异常。期望 %d 字节，获得了 %d"
+
+#~ msgid "workspace limit for empty substrings reached"
+#~ msgstr "达到空子串的工作空间限制"
+
+#~ msgid "case-changing escapes (\\l, \\L, \\u, \\U) are not allowed here"
+#~ msgstr "这里不允许使用改变大小写的转义符(\\l, \\L, \\u, \\U)"
+
+#~ msgid "repeating a DEFINE group is not allowed"
+#~ msgstr "不允许重复 DEFINE 组"
+
+#~ msgid "Unexpected error in waitpid() (%s)"
+#~ msgstr "waitpid() 出现异常错误 (%s)"
+
#~ msgid "File is empty"
#~ msgstr "文件为空"
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
