[glib/glib-2-50] Update zh_CN translation



commit 08db799a3706442a2a24e3ff1d678f90d3ca29b5
Author: Mandy Wang <wangmychn gmail com>
Date:   Thu Feb 9 14:57:37 2017 +0800

    Update zh_CN translation

 po/zh_CN.po | 1705 ++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 1231 insertions(+), 474 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 45df899..8bc2d37 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -14,24 +14,26 @@
 # Mike Manilone <crtmike gmail com>, 2012.
 # keyring <keyrings 163 com>, 2013.
 # Tong Hui <tonghuix gmail com>, 2014.
+# Mingye Wang <arthur2e5 aosc xyz>, 2015, 2016.
+# Jeff Bai <jeffbai aosc xyz>, 2015, 2016.
 #
-#     Note:"fd" is abbr. of "File Descriptor", 文件描述符
+#     Note: "fd" is abbr. of "File Descriptor", 文件描述符
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: glib master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=glib&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2016-03-25 19:54+0000\n"
-"PO-Revision-Date: 2016-03-26 15:31+0800\n"
-"Last-Translator: Jeff Bai <jeffbai aosc xyz>\n"
+"POT-Creation-Date: 2016-12-07 20:45+0000\n"
+"PO-Revision-Date: 2017-02-09 14:57+0800\n"
+"Last-Translator: Mandy Wang <wangmychn gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 1.8.7\n"
+"X-Generator: Poedit 1.8.11\n"
 
 #: ../gio/gapplication.c:493
 msgid "GApplication options"
@@ -50,7 +52,8 @@ msgid "Override the application's ID"
 msgstr "覆盖应用程序 ID"
 
 #: ../gio/gapplication-tool.c:45 ../gio/gapplication-tool.c:46
-#: ../gio/gresource-tool.c:488 ../gio/gsettings-tool.c:512
+#: ../gio/gio-tool.c:209 ../gio/gresource-tool.c:488
+#: ../gio/gsettings-tool.c:520
 msgid "Print help"
 msgstr "打印帮助"
 
@@ -59,11 +62,11 @@ msgstr "打印帮助"
 msgid "[COMMAND]"
 msgstr "[COMMAND]"
 
-#: ../gio/gapplication-tool.c:49
+#: ../gio/gapplication-tool.c:49 ../gio/gio-tool.c:210
 msgid "Print version"
 msgstr "打印版本"
 
-#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:518
+#: ../gio/gapplication-tool.c:50 ../gio/gsettings-tool.c:526
 msgid "Print version information and exit"
 msgstr "打印版本信息并退出"
 
@@ -112,7 +115,7 @@ msgid "APPID"
 msgstr "APPID"
 
 #: ../gio/gapplication-tool.c:70 ../gio/gapplication-tool.c:133
-#: ../gio/gdbus-tool.c:90
+#: ../gio/gdbus-tool.c:90 ../gio/gio-tool.c:206
 msgid "COMMAND"
 msgstr "COMMAND"
 
@@ -124,9 +127,9 @@ msgstr "要打印其详细帮助的命令"
 msgid "Application identifier in D-Bus format (eg: org.example.viewer)"
 msgstr "D-Bus 格式的应用标识符(比如:org.example.viewer)"
 
-#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:592
-#: ../gio/glib-compile-resources.c:623 ../gio/gresource-tool.c:495
-#: ../gio/gresource-tool.c:561
+#: ../gio/gapplication-tool.c:72 ../gio/glib-compile-resources.c:622
+#: ../gio/glib-compile-resources.c:628 ../gio/glib-compile-resources.c:654
+#: ../gio/gresource-tool.c:495 ../gio/gresource-tool.c:561
 msgid "FILE"
 msgstr "FILE"
 
@@ -151,7 +154,7 @@ msgid "Optional parameter to the action invocation, in GVariant format"
 msgstr "可选的动作调用参数,GVariant 格式"
 
 #: ../gio/gapplication-tool.c:96 ../gio/gresource-tool.c:526
-#: ../gio/gsettings-tool.c:598
+#: ../gio/gsettings-tool.c:612
 #, c-format
 msgid ""
 "Unknown command %s\n"
@@ -165,11 +168,11 @@ msgid "Usage:\n"
 msgstr "用法:\n"
 
 #: ../gio/gapplication-tool.c:114 ../gio/gresource-tool.c:551
-#: ../gio/gsettings-tool.c:632
+#: ../gio/gsettings-tool.c:647
 msgid "Arguments:\n"
 msgstr "参数:\n"
 
-#: ../gio/gapplication-tool.c:133
+#: ../gio/gapplication-tool.c:133 ../gio/gio-tool.c:206
 msgid "[ARGS...]"
 msgstr "[ARGS...]"
 
@@ -267,7 +270,7 @@ msgstr ""
 
 #: ../gio/gbufferedinputstream.c:420 ../gio/gbufferedinputstream.c:498
 #: ../gio/ginputstream.c:179 ../gio/ginputstream.c:379
-#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1016
+#: ../gio/ginputstream.c:617 ../gio/ginputstream.c:1019
 #: ../gio/goutputstream.c:203 ../gio/goutputstream.c:834
 #: ../gio/gpollableinputstream.c:205 ../gio/gpollableoutputstream.c:206
 #, c-format
@@ -277,14 +280,14 @@ msgstr "传递给 %s 的计数值太大"
 #: ../gio/gbufferedinputstream.c:891 ../gio/gbufferedoutputstream.c:575
 #: ../gio/gdataoutputstream.c:562
 msgid "Seek not supported on base stream"
-msgstr "基流(base stream)不支持定位(seek)"
+msgstr "基流不支持定位"
 
 #: ../gio/gbufferedinputstream.c:937
 msgid "Cannot truncate GBufferedInputStream"
 msgstr "无法截断 GBufferedInputStream"
 
-#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1205
-#: ../gio/giostream.c:300 ../gio/goutputstream.c:1658
+#: ../gio/gbufferedinputstream.c:982 ../gio/ginputstream.c:1208
+#: ../gio/giostream.c:300 ../gio/goutputstream.c:1660
 msgid "Stream is already closed"
 msgstr "流已经关闭"
 
@@ -292,9 +295,9 @@ msgstr "流已经关闭"
 msgid "Truncate not supported on base stream"
 msgstr "基流(base stream)不支持截断"
 
-#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1847
-#: ../gio/gdbusprivate.c:1375 ../gio/glocalfile.c:2220
-#: ../gio/gsimpleasyncresult.c:870 ../gio/gsimpleasyncresult.c:896
+#: ../gio/gcancellable.c:317 ../gio/gdbusconnection.c:1849
+#: ../gio/gdbusprivate.c:1377 ../gio/gsimpleasyncresult.c:870
+#: ../gio/gsimpleasyncresult.c:896
 #, c-format
 msgid "Operation was cancelled"
 msgstr "操作被取消"
@@ -312,9 +315,9 @@ msgid "Not enough space in destination"
 msgstr "目标位置没有足够的空间"
 
 #: ../gio/gcharsetconverter.c:342 ../gio/gdatainputstream.c:848
-#: ../gio/gdatainputstream.c:1256 ../glib/gconvert.c:438 ../glib/gconvert.c:845
+#: ../gio/gdatainputstream.c:1257 ../glib/gconvert.c:438 ../glib/gconvert.c:845
 #: ../glib/giochannel.c:1556 ../glib/giochannel.c:1598
-#: ../glib/giochannel.c:2442 ../glib/gutf8.c:853 ../glib/gutf8.c:1306
+#: ../glib/giochannel.c:2442 ../glib/gutf8.c:855 ../glib/gutf8.c:1308
 msgid "Invalid byte sequence in conversion input"
 msgstr "转换输入中出现无效字符序列"
 
@@ -388,7 +391,7 @@ msgstr "地址 %s 无效(需要指定的一个路径、临时目录或抽象键)
 #: ../gio/gdbusaddress.c:193
 #, c-format
 msgid "Meaningless key/value pair combination in address entry '%s'"
-msgstr "地址条目“%s”中无意义的键值对组合"
+msgstr "地址条目“%s”中无意义的键/值对组合"
 
 #: ../gio/gdbusaddress.c:256 ../gio/gdbusaddress.c:337
 #, c-format
@@ -398,7 +401,7 @@ msgstr "地址“%s”中有错误 - 端口属性格式错误"
 #: ../gio/gdbusaddress.c:267 ../gio/gdbusaddress.c:348
 #, c-format
 msgid "Error in address '%s' - the family attribute is malformed"
-msgstr "地址“%s”中有错误 - 类别 (family) 属性格式错误"
+msgstr "地址“%s”中有错误 - 协议族属性格式错误"
 
 #: ../gio/gdbusaddress.c:457
 #, c-format
@@ -410,21 +413,21 @@ msgstr "地址元素“%s”不包含冒号(:)"
 msgid ""
 "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:492
 #, c-format
 msgid ""
 "Error unescaping key or value in Key/Value pair %d, '%s', in address element "
 "'%s'"
-msgstr "在键/值对 %d ,“%s”在地址元素“%s”,中去转义发生错误"
+msgstr "在地址元素“%3$s”中,对键/值对 %1$d、“%2$s”取消转义键或值时出错"
 
 #: ../gio/gdbusaddress.c:570
 #, 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”之一的键被设置。"
+msgstr "地址 %s 中有错误 - UNIX 传输需要“path”或“abstract”之一的键被设置。"
 
 #: ../gio/gdbusaddress.c:606
 #, c-format
@@ -439,7 +442,7 @@ msgstr "地址“%s”中有错误 - 端口属性丢失或格式错误"
 #: ../gio/gdbusaddress.c:634
 #, c-format
 msgid "Error in address '%s' - the noncefile attribute is missing or malformed"
-msgstr "地址“%s”中有错误 - noncefile 属性丢失或格式错误"
+msgstr "地址“%s”中有错误 - 临时文件属性丢失或格式错误"
 
 #: ../gio/gdbusaddress.c:655
 msgid "Error auto-launching: "
@@ -453,70 +456,75 @@ msgstr "对地址 %2$s 的未知或不支持的传输 %1$s"
 #: ../gio/gdbusaddress.c:699
 #, c-format
 msgid "Error opening nonce file '%s': %s"
-msgstr "打开临时文件“%s”出错:%s"
+msgstr "打开临时文件“%s”时出错:%s"
 
 #: ../gio/gdbusaddress.c:717
 #, c-format
 msgid "Error reading from nonce file '%s': %s"
-msgstr "读取临时文件“%s”出错:%s"
+msgstr "读取临时文件“%s”时出错:%s"
 
 #: ../gio/gdbusaddress.c:726
 #, c-format
 msgid "Error reading from nonce file '%s', expected 16 bytes, got %d"
-msgstr "读取临时文件“%s”出错,预期 16 个字节,得到了 %d 个字节"
+msgstr "读取临时文件“%s”时出错,预计 16 个字节,得到 %d 个字节"
 
 #: ../gio/gdbusaddress.c:744
 #, c-format
 msgid "Error writing contents of nonce file '%s' to stream:"
 msgstr "写入临时文件 %s 的内容到流的过程中出错:"
 
-#: ../gio/gdbusaddress.c:950
+#: ../gio/gdbusaddress.c:951
 msgid "The given address is empty"
 msgstr "给出的地址为空"
 
-#: ../gio/gdbusaddress.c:1063
+#: ../gio/gdbusaddress.c:1064
 #, c-format
 msgid "Cannot spawn a message bus when setuid"
 msgstr "无法在 setuid 时启动一条消息总线"
 
-#: ../gio/gdbusaddress.c:1070
+#: ../gio/gdbusaddress.c:1071
 msgid "Cannot spawn a message bus without a machine-id: "
 msgstr "无法在无机器 ID 时启动一条消息总线:"
 
-#: ../gio/gdbusaddress.c:1112
+#: ../gio/gdbusaddress.c:1078
+#, c-format
+msgid "Cannot autolaunch D-Bus without X11 $DISPLAY"
+msgstr "无法在没有 X11 $DISPLAY 的情况下自动启动 D-Bus"
+
+#: ../gio/gdbusaddress.c:1120
 #, c-format
 msgid "Error spawning command line '%s': "
-msgstr "启动命令 %s 出错:"
+msgstr "生成并运行命令行 %s 时出错:"
 
-#: ../gio/gdbusaddress.c:1329
+#: ../gio/gdbusaddress.c:1337
 #, c-format
 msgid "(Type any character to close this window)\n"
 msgstr "(按任意键关闭本窗口)\n"
 
-#: ../gio/gdbusaddress.c:1481
+#: ../gio/gdbusaddress.c:1489
 #, c-format
 msgid "Session dbus not running, and autolaunch failed"
 msgstr "dbus 会话未运行,自动启动失败"
 
-#: ../gio/gdbusaddress.c:1492
+#: ../gio/gdbusaddress.c:1500
 #, c-format
 msgid "Cannot determine session bus address (not implemented for this OS)"
 msgstr "无法确定会话总线地址(尚未在此操作系统上实现)"
 
-#: ../gio/gdbusaddress.c:1627 ../gio/gdbusconnection.c:7128
+#: ../gio/gdbusaddress.c:1635 ../gio/gdbusconnection.c:7133
 #, 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:1636 ../gio/gdbusconnection.c:7137
+#: ../gio/gdbusaddress.c:1644 ../gio/gdbusconnection.c:7142
 msgid ""
 "Cannot determine bus address because the DBUS_STARTER_BUS_TYPE environment "
 "variable is not set"
 msgstr "无法确定总线地址,因为环境变量 DBUS_STARTER_BUS_TYPE 未设置"
 
-#: ../gio/gdbusaddress.c:1646
+#: ../gio/gdbusaddress.c:1654
 #, c-format
 msgid "Unknown bus type %d"
 msgstr "未知的总线类型 %d"
@@ -535,7 +543,7 @@ msgid ""
 "Exhausted all available authentication mechanisms (tried: %s) (available: %s)"
 msgstr "用尽了所有可用的认证机制(已尝试:%s)(可用的:%s)"
 
-#: ../gio/gdbusauth.c:1170
+#: ../gio/gdbusauth.c:1173
 msgid "Cancelled via GDBusAuthObserver::authorize-authenticated-peer"
 msgstr "通过 GDBusAuthObserver::authorize-authenticated-peer 取消"
 
@@ -548,12 +556,12 @@ msgstr "获取目录“%s”信息时发生错误:%s"
 #, c-format
 msgid ""
 "Permissions on directory '%s' are malformed. Expected mode 0700, got 0%o"
-msgstr "目录“%s”权限错误。期望 0700,却得到了 0%o"
+msgstr "目录“%s”权限错误。期望 0700,得到 0%o"
 
 #: ../gio/gdbusauthmechanismsha1.c:294
 #, c-format
 msgid "Error creating directory '%s': %s"
-msgstr "创建目录“%s”出错:%s"
+msgstr "创建目录“%s”时出错:%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:377
 #, c-format
@@ -563,144 +571,144 @@ msgstr "打开密钥环“%s”读取时出错:"
 #: ../gio/gdbusauthmechanismsha1.c:401 ../gio/gdbusauthmechanismsha1.c:714
 #, c-format
 msgid "Line %d of the keyring at '%s' with content '%s' is malformed"
-msgstr "%2$s 处的密钥环的 %1$d 行有不符合格式的内容 %3$s"
+msgstr "“%2$s”处的密钥环的 %1$d 行有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:415 ../gio/gdbusauthmechanismsha1.c:728
 #, 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"
+msgstr "“%2$s”处的密钥环的 %1$d 行第一个令牌有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:430 ../gio/gdbusauthmechanismsha1.c:742
 #, c-format
 msgid ""
 "Second token of line %d of the keyring at '%s' with content '%s' is malformed"
-msgstr "%2$s 处的密钥环的 %1$d 行第二个令牌有不符合格式的内容 %3$s"
+msgstr "“%2$s”处的密钥环的 %1$d 行第二个令牌有不符合格式的内容“%3$s”"
 
 #: ../gio/gdbusauthmechanismsha1.c:454
 #, c-format
 msgid "Didn't find cookie with id %d in the keyring at '%s'"
-msgstr "未在 %2$s 处的密钥环中找到 ID 为 %1$d 的 cookie"
+msgstr "未在“%2$s”处的密钥环中找到 ID 为 %1$d 的 cookie"
 
 #: ../gio/gdbusauthmechanismsha1.c:532
 #, c-format
 msgid "Error deleting stale lock file '%s': %s"
-msgstr "删除失效的锁文件“%s”出错:%s"
+msgstr "删除失效的锁文件“%s”时出错:%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:564
 #, c-format
 msgid "Error creating lock file '%s': %s"
-msgstr "创建锁文件“%s”出错:%s"
+msgstr "创建锁文件“%s”时出错:%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:594
 #, c-format
 msgid "Error closing (unlinked) lock file '%s': %s"
-msgstr "关闭(删除)锁文件“%s”出错:%s"
+msgstr "关闭(已删除的)锁文件“%s”时出错:%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:604
 #, c-format
 msgid "Error unlinking lock file '%s': %s"
-msgstr "删除锁文件“%s”出错:%s"
+msgstr "删除锁文件“%s”时出错:%s"
 
 #: ../gio/gdbusauthmechanismsha1.c:681
 #, c-format
 msgid "Error opening keyring '%s' for writing: "
-msgstr "打开钥匙环“%s”以写入出错:"
+msgstr "打开钥匙环“%s”以写入时出错:"
 
 #: ../gio/gdbusauthmechanismsha1.c:878
 #, c-format
 msgid "(Additionally, releasing the lock for '%s' also failed: %s) "
 msgstr "(此外,释放 %s 的锁失败:%s)"
 
-#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2373
+#: ../gio/gdbusconnection.c:612 ../gio/gdbusconnection.c:2377
 msgid "The connection is closed"
 msgstr "连接已关闭"
 
-#: ../gio/gdbusconnection.c:1877
+#: ../gio/gdbusconnection.c:1879
 msgid "Timeout was reached"
 msgstr "已到超时限制"
 
-#: ../gio/gdbusconnection.c:2495
+#: ../gio/gdbusconnection.c:2499
 msgid ""
 "Unsupported flags encountered when constructing a client-side connection"
 msgstr "构建客户端连接时遇到不支持的标志"
 
-#: ../gio/gdbusconnection.c:4105 ../gio/gdbusconnection.c:4452
+#: ../gio/gdbusconnection.c:4109 ../gio/gdbusconnection.c:4456
 #, c-format
 msgid ""
 "No such interface 'org.freedesktop.DBus.Properties' on object at path %s"
 msgstr "路径 %s 的对象上没有 org.freedesktop.DBus.Properties 接口"
 
-#: ../gio/gdbusconnection.c:4247
+#: ../gio/gdbusconnection.c:4251
 #, c-format
 msgid "No such property '%s'"
 msgstr "无此属性:%s"
 
-#: ../gio/gdbusconnection.c:4259
+#: ../gio/gdbusconnection.c:4263
 #, c-format
 msgid "Property '%s' is not readable"
 msgstr "属性 %s 不可读"
 
-#: ../gio/gdbusconnection.c:4270
+#: ../gio/gdbusconnection.c:4274
 #, c-format
 msgid "Property '%s' is not writable"
 msgstr "属性 %s 不可写"
 
-#: ../gio/gdbusconnection.c:4290
+#: ../gio/gdbusconnection.c:4294
 #, c-format
 msgid "Error setting property '%s': Expected type '%s' but got '%s'"
 msgstr "设置属性 %s 出错:期望 %s 类型但得到 %s 类型"
 
-#: ../gio/gdbusconnection.c:4395 ../gio/gdbusconnection.c:6568
+#: ../gio/gdbusconnection.c:4399 ../gio/gdbusconnection.c:6573
 #, c-format
 msgid "No such interface '%s'"
 msgstr "无此接口:%s"
 
-#: ../gio/gdbusconnection.c:4603
+#: ../gio/gdbusconnection.c:4607
 msgid "No such interface"
 msgstr "无此接口"
 
-#: ../gio/gdbusconnection.c:4821 ../gio/gdbusconnection.c:7077
+#: ../gio/gdbusconnection.c:4825 ../gio/gdbusconnection.c:7082
 #, c-format
 msgid "No such interface '%s' on object at path %s"
 msgstr "在路径 %s 的对象上没有 %s 接口"
 
-#: ../gio/gdbusconnection.c:4919
+#: ../gio/gdbusconnection.c:4923
 #, c-format
 msgid "No such method '%s'"
 msgstr "无此方法:%s"
 
-#: ../gio/gdbusconnection.c:4950
+#: ../gio/gdbusconnection.c:4954
 #, c-format
 msgid "Type of message, '%s', does not match expected type '%s'"
 msgstr "消息的类型“%s”,与预期的类型“%s”不匹配"
 
-#: ../gio/gdbusconnection.c:5148
+#: ../gio/gdbusconnection.c:5152
 #, c-format
 msgid "An object is already exported for the interface %s at %s"
 msgstr "%2$s 处的接口 %1$s 已经导出了一个对象"
 
-#: ../gio/gdbusconnection.c:5374
+#: ../gio/gdbusconnection.c:5378
 #, c-format
 msgid "Unable to retrieve property %s.%s"
 msgstr "无法接收属性 %s:%s"
 
-#: ../gio/gdbusconnection.c:5430
+#: ../gio/gdbusconnection.c:5434
 #, c-format
 msgid "Unable to set property %s.%s"
 msgstr "无法设置属性 %s:%s"
 
-#: ../gio/gdbusconnection.c:5606
+#: ../gio/gdbusconnection.c:5610
 #, c-format
 msgid "Method '%s' returned type '%s', but expected '%s'"
 msgstr "方法“%s”返回类型“%s”,但预期的是“%s”"
 
-#: ../gio/gdbusconnection.c:6679
+#: ../gio/gdbusconnection.c:6684
 #, c-format
 msgid "Method '%s' on interface '%s' with signature '%s' does not exist"
 msgstr "带有 %3$s 签名的接口 %2$s 上不存在 %1$s 方法"
 
-#: ../gio/gdbusconnection.c:6800
+#: ../gio/gdbusconnection.c:6805
 #, c-format
 msgid "A subtree is already exported for %s"
 msgstr "已经为 %s 导出一个子树"
@@ -746,7 +754,7 @@ msgstr[0] "期望读取 %lu 个字节但只得到 %lu 个"
 #: ../gio/gdbusmessage.c:1369
 #, c-format
 msgid "Expected NUL byte after the string '%s' but found byte %d"
-msgstr "期望 %s 后为 NUL 字节但得到字节 %d"
+msgstr "期望“%s”后为 NUL 字节但得到字节 %d"
 
 #: ../gio/gdbusmessage.c:1388
 #, c-format
@@ -755,17 +763,17 @@ msgid ""
 "(length of string is %d). The valid UTF-8 string up until that point was '%s'"
 msgstr ""
 "期望得到有效的 UTF-8 字符串,但在字节偏移 %d 处(字符串长度为 %d)得到了无效的"
-"字节。该点的有效 UTF-8 字符串曾是 %s。"
+"字节。该点的有效 UTF-8 字符串曾是“%s”。"
 
 #: ../gio/gdbusmessage.c:1587
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus object path"
-msgstr "已解析的值 %s 不是有效的 D-Bus 对象路径"
+msgstr "已解析的值“%s”不是有效的 D-Bus 对象路径"
 
 #: ../gio/gdbusmessage.c:1609
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus signature"
-msgstr "已解析的值 %s 不是有效的 D-Bus 签名"
+msgstr "已解析的值“%s”不是有效的 D-Bus 签名"
 
 #: ../gio/gdbusmessage.c:1656
 #, c-format
@@ -780,12 +788,13 @@ msgstr[0] "得到长度为 %u 字节的数组,最大长度应为 2<<26 字节(
 msgid ""
 "Encountered array of type 'a%c', expected to have a length a multiple of %u "
 "bytes, but found to be %u bytes in length"
-msgstr "得到类型为 a%c 的数组,长度需要是 %u 的倍数,但是现在长度为 %u"
+msgstr ""
+"得到类型为“a%c”的数组,期望长度为 %u 字节的倍数,但是得到长度为 %u 字节。"
 
 #: ../gio/gdbusmessage.c:1843
 #, c-format
 msgid "Parsed value '%s' for variant is not a valid D-Bus signature"
-msgstr "已解析的衍生属性值 %s 不是有效的 D-Bus 签名"
+msgstr "已解析的衍生属性值“%s”不是有效的 D-Bus 签名"
 
 #: ../gio/gdbusmessage.c:1867
 #, c-format
@@ -798,7 +807,7 @@ msgstr "在以 D-Bus 线格式用类型字符串“%s”反序列化 GVariant 
 msgid ""
 "Invalid endianness value. Expected 0x6c ('l') or 0x42 ('B') but found value "
 "0x%02x"
-msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但是发现了值 0x%02x"
+msgstr "无效的字节序值。期望为 0x6c (“l”)或 0x42 (“B”)但得到值 0x%02x"
 
 #: ../gio/gdbusmessage.c:2064
 #, c-format
@@ -808,12 +817,12 @@ msgstr "无效的主协议版本。期望 1,但是找到了 %d"
 #: ../gio/gdbusmessage.c:2120
 #, c-format
 msgid "Signature header with signature '%s' found but message body is empty"
-msgstr "头部带有 %s 签名但消息主体为空"
+msgstr "发现签名“%s”的签名头部,但邮件正文为空"
 
 #: ../gio/gdbusmessage.c:2134
 #, c-format
 msgid "Parsed value '%s' is not a valid D-Bus signature (for body)"
-msgstr "已解析的值 %s 不是有效的 D-Bus 签名(针对消息主体)"
+msgstr "已解析的值“%s”不是有效的 D-Bus 签名(针对消息主体)"
 
 #: ../gio/gdbusmessage.c:2164
 #, c-format
@@ -845,49 +854,49 @@ msgstr "无法串行消息:"
 #: ../gio/gdbusmessage.c:2704
 #, c-format
 msgid "Message body has signature '%s' but there is no signature header"
-msgstr "消息主体有签名 %s 但头部没有签名"
+msgstr "消息主体有签名“%s”但是没有签名头部"
 
 #: ../gio/gdbusmessage.c:2714
 #, c-format
 msgid ""
 "Message body has type signature '%s' but signature in the header field is "
 "'%s'"
-msgstr "消息主体有类型签名 %s 但头部的签名为 %s"
+msgstr "消息主体有类型签名“%s”但头域的签名为“%s”"
 
 #: ../gio/gdbusmessage.c:2730
 #, c-format
 msgid "Message body is empty but signature in the header field is '(%s)'"
-msgstr "消息主体为空,但头部有签名 %s"
+msgstr "消息主体为空,但头域的签名为“(%s)”"
 
 #: ../gio/gdbusmessage.c:3283
 #, c-format
 msgid "Error return with body of type '%s'"
-msgstr "返回主体类型 %s 出错"
+msgstr "返回主体类型“%s”出错"
 
 #: ../gio/gdbusmessage.c:3291
 msgid "Error return with empty body"
 msgstr "返回空主体出错"
 
-#: ../gio/gdbusprivate.c:2036
+#: ../gio/gdbusprivate.c:2038
 #, c-format
 msgid "Unable to get Hardware profile: %s"
 msgstr "无法获得硬件测量信息:%s"
 
-#: ../gio/gdbusprivate.c:2081
+#: ../gio/gdbusprivate.c:2083
 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:1610
+#: ../gio/gdbusproxy.c:1611
 #, c-format
 msgid "Error calling StartServiceByName for %s: "
 msgstr "为 %s 调用 StartServiceByName 出错:"
 
-#: ../gio/gdbusproxy.c:1633
+#: ../gio/gdbusproxy.c:1634
 #, c-format
 msgid "Unexpected reply %d from StartServiceByName(\"%s\") method"
 msgstr "从 StartServiceByName(%2$s) 方式处获得意外回复 %1$d"
 
-#: ../gio/gdbusproxy.c:2709 ../gio/gdbusproxy.c:2843
+#: ../gio/gdbusproxy.c:2713 ../gio/gdbusproxy.c:2847
 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"
@@ -906,7 +915,7 @@ msgstr "创建服务器时无法指定临时文件"
 #: ../gio/gdbusserver.c:873
 #, c-format
 msgid "Error writing nonce file at '%s': %s"
-msgstr "写入“%s”处的临时文件出错:%s"
+msgstr "写入“%s”处的临时文件时出错:%s"
 
 #: ../gio/gdbusserver.c:1044
 #, c-format
@@ -916,7 +925,7 @@ msgstr "字符串“%s”不是有效 D-Bus GUID"
 #: ../gio/gdbusserver.c:1084
 #, c-format
 msgid "Cannot listen on unsupported transport '%s'"
-msgstr "无法监听不支持的传输 %s"
+msgstr "无法监听不支持的传输“%s”"
 
 #: ../gio/gdbus-tool.c:95
 #, c-format
@@ -932,20 +941,21 @@ msgid ""
 msgstr ""
 "命令:\n"
 "  help         显示本信息\n"
-"  introspect   Introspect 一个远程对象\n"
+"  introspect   内省一个远程对象\n"
 "  monitor      监视一个远程对象\n"
 "  call         调用远程对象的一个方法\n"
+"  emit        发出一个信号\n"
 "\n"
 "使用“%s COMMAND --help”以获得每一个命令的帮助。\n"
 
 #: ../gio/gdbus-tool.c:164 ../gio/gdbus-tool.c:226 ../gio/gdbus-tool.c:298
-#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:711 ../gio/gdbus-tool.c:1043
-#: ../gio/gdbus-tool.c:1477
+#: ../gio/gdbus-tool.c:322 ../gio/gdbus-tool.c:724 ../gio/gdbus-tool.c:1067
+#: ../gio/gdbus-tool.c:1509 ../gio/gio-tool-rename.c:84
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误:%s\n"
 
-#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1493
+#: ../gio/gdbus-tool.c:175 ../gio/gdbus-tool.c:239 ../gio/gdbus-tool.c:1525
 #, c-format
 msgid "Error parsing introspection XML: %s\n"
 msgstr "解析 Introspection XML 时出错:%s\n"
@@ -996,7 +1006,7 @@ msgstr "警告:根据 Introspection 数据,接口“%s”不存在\n"
 msgid ""
 "Warning: According to introspection data, method '%s' does not exist on "
 "interface '%s'\n"
-msgstr "警告:根据 Introspection 数据,在接口“%s”中方法“%s”不存在\n"
+msgstr "警告:根据 Introspection 数据,在接口“%2$s”中方法“%1$s”不存在\n"
 
 #: ../gio/gdbus-tool.c:542
 msgid "Optional destination for signal (unique name)"
@@ -1010,207 +1020,207 @@ msgstr "要触发信号的对象路径"
 msgid "Signal and interface name"
 msgstr "信号和接口名称"
 
-#: ../gio/gdbus-tool.c:576
+#: ../gio/gdbus-tool.c:578
 msgid "Emit a signal."
 msgstr "发射信号。"
 
-#: ../gio/gdbus-tool.c:610 ../gio/gdbus-tool.c:842 ../gio/gdbus-tool.c:1583
-#: ../gio/gdbus-tool.c:1818
+#: ../gio/gdbus-tool.c:612 ../gio/gdbus-tool.c:857 ../gio/gdbus-tool.c:1615
+#: ../gio/gdbus-tool.c:1850
 #, c-format
 msgid "Error connecting: %s\n"
 msgstr "连接时出错:%s\n"
 
-#: ../gio/gdbus-tool.c:622
+#: ../gio/gdbus-tool.c:624
 #, c-format
 msgid "Error: object path not specified.\n"
 msgstr "错误:没有指定对象路径。\n"
 
-#: ../gio/gdbus-tool.c:627 ../gio/gdbus-tool.c:909 ../gio/gdbus-tool.c:1648
-#: ../gio/gdbus-tool.c:1884
+#: ../gio/gdbus-tool.c:629 ../gio/gdbus-tool.c:924 ../gio/gdbus-tool.c:1680
+#: ../gio/gdbus-tool.c:1916
 #, c-format
 msgid "Error: %s is not a valid object path\n"
 msgstr "错误:%s 不是有效的对象路径\n"
 
-#: ../gio/gdbus-tool.c:633
+#: ../gio/gdbus-tool.c:635
 #, c-format
 msgid "Error: signal not specified.\n"
 msgstr "错误:没有指定对象。\n"
 
-#: ../gio/gdbus-tool.c:640
+#: ../gio/gdbus-tool.c:642
 #, c-format
 msgid "Error: signal must be the fully-qualified name.\n"
 msgstr "错误:信号必须是完全限定名。\n"
 
-#: ../gio/gdbus-tool.c:648
+#: ../gio/gdbus-tool.c:650
 #, c-format
 msgid "Error: %s is not a valid interface name\n"
 msgstr "错误:%s 不是有效的接口名称。\n"
 
-#: ../gio/gdbus-tool.c:654
+#: ../gio/gdbus-tool.c:656
 #, c-format
 msgid "Error: %s is not a valid member name\n"
 msgstr "错误:%s 不是有效的成员名称。\n"
 
-#: ../gio/gdbus-tool.c:660
+#: ../gio/gdbus-tool.c:662
 #, c-format
 msgid "Error: %s is not a valid unique bus name.\n"
 msgstr "错误:%s 不是有效的唯一总线名。\n"
 
 #. Use the original non-"parse-me-harder" error
-#: ../gio/gdbus-tool.c:687 ../gio/gdbus-tool.c:1011
+#: ../gio/gdbus-tool.c:699 ../gio/gdbus-tool.c:1036
 #, c-format
 msgid "Error parsing parameter %d: %s\n"
 msgstr "解析第 %d 个选项出错:%s\n"
 
-#: ../gio/gdbus-tool.c:718
+#: ../gio/gdbus-tool.c:731
 #, c-format
 msgid "Error flushing connection: %s\n"
 msgstr "清空连接接时出错:%s\n"
 
-#: ../gio/gdbus-tool.c:745
+#: ../gio/gdbus-tool.c:758
 msgid "Destination name to invoke method on"
 msgstr "调用方法的目标位置名称"
 
-#: ../gio/gdbus-tool.c:746
+#: ../gio/gdbus-tool.c:759
 msgid "Object path to invoke method on"
 msgstr "调用方法的对象路径"
 
-#: ../gio/gdbus-tool.c:747
+#: ../gio/gdbus-tool.c:760
 msgid "Method and interface name"
 msgstr "方法和接口名称"
 
-#: ../gio/gdbus-tool.c:748
+#: ../gio/gdbus-tool.c:761
 msgid "Timeout in seconds"
 msgstr "超时(以秒为单位)"
 
-#: ../gio/gdbus-tool.c:787
+#: ../gio/gdbus-tool.c:802
 msgid "Invoke a method on a remote object."
 msgstr "在远程对象上调用一个方法。"
 
-#: ../gio/gdbus-tool.c:862 ../gio/gdbus-tool.c:1602 ../gio/gdbus-tool.c:1837
+#: ../gio/gdbus-tool.c:877 ../gio/gdbus-tool.c:1634 ../gio/gdbus-tool.c:1869
 #, c-format
 msgid "Error: Destination is not specified\n"
 msgstr "错误:没有指定目标位置名称\n"
 
-#: ../gio/gdbus-tool.c:874 ../gio/gdbus-tool.c:1619 ../gio/gdbus-tool.c:1849
+#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1651 ../gio/gdbus-tool.c:1881
 #, c-format
 msgid "Error: %s is not a valid bus name\n"
 msgstr "错误:%s 不是有效的总线名称。\n"
 
-#: ../gio/gdbus-tool.c:889 ../gio/gdbus-tool.c:1628
+#: ../gio/gdbus-tool.c:904 ../gio/gdbus-tool.c:1660
 #, c-format
 msgid "Error: Object path is not specified\n"
 msgstr "错误:没有指定对象路径\n"
 
-#: ../gio/gdbus-tool.c:924
+#: ../gio/gdbus-tool.c:939
 #, c-format
 msgid "Error: Method name is not specified\n"
 msgstr "错误:方法名没有指定\n"
 
-#: ../gio/gdbus-tool.c:935
+#: ../gio/gdbus-tool.c:950
 #, c-format
 msgid "Error: Method name '%s' is invalid\n"
 msgstr "错误:方法名“%s”无效\n"
 
-#: ../gio/gdbus-tool.c:1003
+#: ../gio/gdbus-tool.c:1028
 #, c-format
 msgid "Error parsing parameter %d of type '%s': %s\n"
-msgstr "解析 %2$s 类型的参数 %1$d 时发生错误:%3$s\n"
+msgstr "解析\"%2$s\"类型的参数 %1$d 时发生错误:%3$s\n"
 
-#: ../gio/gdbus-tool.c:1440
+#: ../gio/gdbus-tool.c:1472
 msgid "Destination name to introspect"
 msgstr "要 Introspect 的目标位置名称"
 
-#: ../gio/gdbus-tool.c:1441
+#: ../gio/gdbus-tool.c:1473
 msgid "Object path to introspect"
 msgstr "要 Introspect 的对象路径"
 
-#: ../gio/gdbus-tool.c:1442
+#: ../gio/gdbus-tool.c:1474
 msgid "Print XML"
 msgstr "输出 XML"
 
-#: ../gio/gdbus-tool.c:1443
+#: ../gio/gdbus-tool.c:1475
 msgid "Introspect children"
 msgstr "Introspect 子对象"
 
-#: ../gio/gdbus-tool.c:1444
+#: ../gio/gdbus-tool.c:1476
 msgid "Only print properties"
 msgstr "只打印属性"
 
-#: ../gio/gdbus-tool.c:1535
+#: ../gio/gdbus-tool.c:1567
 msgid "Introspect a remote object."
 msgstr "Introspect 远程对象。"
 
-#: ../gio/gdbus-tool.c:1740
+#: ../gio/gdbus-tool.c:1772
 msgid "Destination name to monitor"
 msgstr "要监视的目标位置名称"
 
-#: ../gio/gdbus-tool.c:1741
+#: ../gio/gdbus-tool.c:1773
 msgid "Object path to monitor"
 msgstr "要监视的对象路径"
 
-#: ../gio/gdbus-tool.c:1770
+#: ../gio/gdbus-tool.c:1802
 msgid "Monitor a remote object."
 msgstr "监视一个远程对象。"
 
-#: ../gio/gdesktopappinfo.c:1993 ../gio/gdesktopappinfo.c:4503
+#: ../gio/gdesktopappinfo.c:1994 ../gio/gdesktopappinfo.c:4501
 msgid "Unnamed"
 msgstr "未命名"
 
-#: ../gio/gdesktopappinfo.c:2402
+#: ../gio/gdesktopappinfo.c:2404
 msgid "Desktop file didn't specify Exec field"
 msgstr "桌面文件未指定 Exec 区域"
 
-#: ../gio/gdesktopappinfo.c:2687
+#: ../gio/gdesktopappinfo.c:2689
 msgid "Unable to find terminal required for application"
 msgstr "无法找到应用程序需要的终端"
 
-#: ../gio/gdesktopappinfo.c:3099
+#: ../gio/gdesktopappinfo.c:3097
 #, c-format
 msgid "Can't create user application configuration folder %s: %s"
 msgstr "无法创建用户应用程序配置文件夹 %s:%s"
 
-#: ../gio/gdesktopappinfo.c:3103
+#: ../gio/gdesktopappinfo.c:3101
 #, c-format
 msgid "Can't create user MIME configuration folder %s: %s"
 msgstr "无法创建用户 MIME 配置文件夹 %s:%s"
 
-#: ../gio/gdesktopappinfo.c:3343 ../gio/gdesktopappinfo.c:3367
+#: ../gio/gdesktopappinfo.c:3341 ../gio/gdesktopappinfo.c:3365
 msgid "Application information lacks an identifier"
 msgstr "应用程序信息缺少标志符。"
 
-#: ../gio/gdesktopappinfo.c:3601
+#: ../gio/gdesktopappinfo.c:3599
 #, c-format
 msgid "Can't create user desktop file %s"
 msgstr "无法创建用户桌面文件 %s"
 
-#: ../gio/gdesktopappinfo.c:3735
+#: ../gio/gdesktopappinfo.c:3733
 #, c-format
 msgid "Custom definition for %s"
 msgstr "%s 的自定义定义"
 
-#: ../gio/gdrive.c:392
+#: ../gio/gdrive.c:417
 msgid "drive doesn't implement eject"
-msgstr "驱动器未实现弹出操作"
+msgstr "驱动器未实现弹出"
 
 #. Translators: This is an error
 #. * message for drive objects that
 #. * don't implement any of eject or eject_with_operation.
-#: ../gio/gdrive.c:470
+#: ../gio/gdrive.c:495
 msgid "drive doesn't implement eject or eject_with_operation"
-msgstr "驱动器未实现 eject 或 eject_with_operation"
+msgstr "驱动器未实现弹出或 eject_with_operation"
 
-#: ../gio/gdrive.c:546
+#: ../gio/gdrive.c:571
 msgid "drive doesn't implement polling for media"
 msgstr "驱动器未实现媒体轮询"
 
-#: ../gio/gdrive.c:751
+#: ../gio/gdrive.c:776
 msgid "drive doesn't implement start"
-msgstr "驱动器未实现 start"
+msgstr "驱动器未实现启动"
 
-#: ../gio/gdrive.c:853
+#: ../gio/gdrive.c:878
 msgid "drive doesn't implement stop"
-msgstr "驱动器未实现 stop"
+msgstr "驱动器未实现停止"
 
 #: ../gio/gdummytlsbackend.c:195 ../gio/gdummytlsbackend.c:317
 #: ../gio/gdummytlsbackend.c:509
@@ -1249,10 +1259,10 @@ msgstr "GEmblemedIcon 中应为 GEmblem"
 #: ../gio/gfile.c:1583 ../gio/gfile.c:1638 ../gio/gfile.c:1696
 #: ../gio/gfile.c:1780 ../gio/gfile.c:1837 ../gio/gfile.c:1901
 #: ../gio/gfile.c:1956 ../gio/gfile.c:3604 ../gio/gfile.c:3659
-#: ../gio/gfile.c:3894 ../gio/gfile.c:3936 ../gio/gfile.c:4404
-#: ../gio/gfile.c:4815 ../gio/gfile.c:4900 ../gio/gfile.c:4990
-#: ../gio/gfile.c:5087 ../gio/gfile.c:5174 ../gio/gfile.c:5275
-#: ../gio/gfile.c:7796 ../gio/gfile.c:7886 ../gio/gfile.c:7970
+#: ../gio/gfile.c:3895 ../gio/gfile.c:3937 ../gio/gfile.c:4405
+#: ../gio/gfile.c:4816 ../gio/gfile.c:4901 ../gio/gfile.c:4991
+#: ../gio/gfile.c:5088 ../gio/gfile.c:5175 ../gio/gfile.c:5276
+#: ../gio/gfile.c:7817 ../gio/gfile.c:7907 ../gio/gfile.c:7991
 #: ../gio/win32/gwinhttpfile.c:437
 msgid "Operation not supported"
 msgstr "不支持该操作"
@@ -1261,18 +1271,11 @@ msgstr "不支持该操作"
 #. * 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:1468 ../gio/glocalfile.c:1134 ../gio/glocalfile.c:1145
-#: ../gio/glocalfile.c:1158
+#: ../gio/gfile.c:1468
 msgid "Containing mount does not exist"
 msgstr "包含的挂载不存在"
 
-#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2376
+#: ../gio/gfile.c:2515 ../gio/glocalfile.c:2374
 msgid "Can't copy over directory"
 msgstr "无法跨目录复制"
 
@@ -1280,7 +1283,7 @@ msgstr "无法跨目录复制"
 msgid "Can't copy directory over directory"
 msgstr "无法跨目录复制到目录"
 
-#: ../gio/gfile.c:2583 ../gio/glocalfile.c:2385
+#: ../gio/gfile.c:2583
 msgid "Target file exists"
 msgstr "目标文件已存在"
 
@@ -1295,42 +1298,42 @@ msgstr "不支持拼接"
 #: ../gio/gfile.c:2888
 #, c-format
 msgid "Error splicing file: %s"
-msgstr "拼接文件出错:%s"
+msgstr "拼接文件时出错:%s"
 
 #: ../gio/gfile.c:3019
 msgid "Copy (reflink/clone) between mounts is not supported"
-msgstr "不支持在挂载之间复制(链接/克隆)"
+msgstr "不支持在挂载之间复制(reflink/clone)"
 
 #: ../gio/gfile.c:3023
 msgid "Copy (reflink/clone) is not supported or invalid"
-msgstr "不支持复制(链接/克隆)操作或操作非法"
+msgstr "不支持复制(reflink/clone)操作或操作非法"
 
 #: ../gio/gfile.c:3028
 msgid "Copy (reflink/clone) is not supported or didn't work"
-msgstr "不支持复制(链接/克隆)操作或者不工作"
+msgstr "不支持复制(reflink/clone)操作或者不工作"
 
 #: ../gio/gfile.c:3091
 msgid "Can't copy special file"
 msgstr "无法复制特殊文件"
 
-#: ../gio/gfile.c:3884
+#: ../gio/gfile.c:3885
 msgid "Invalid symlink value given"
 msgstr "给出的符号链接值无效"
 
-#: ../gio/gfile.c:4045
+#: ../gio/gfile.c:4046
 msgid "Trash not supported"
 msgstr "不支持回收站"
 
-#: ../gio/gfile.c:4157
+#: ../gio/gfile.c:4158
 #, c-format
 msgid "File names cannot contain '%c'"
 msgstr "文件名不能包含“%c”"
 
-#: ../gio/gfile.c:6586 ../gio/gvolume.c:363
+#: ../gio/gfile.c:6604 ../gio/gvolume.c:363
 msgid "volume doesn't implement mount"
 msgstr "卷未实现挂载"
 
-#: ../gio/gfile.c:6695
+#: ../gio/gfile.c:6713
 msgid "No application is registered as handling this file"
 msgstr "没有为此类型文件注册相应的处理程序"
 
@@ -1365,7 +1368,7 @@ msgstr "流不支持 query_info"
 #: ../gio/gfileinputstream.c:325 ../gio/gfileiostream.c:379
 #: ../gio/gfileoutputstream.c:371
 msgid "Seek not supported on stream"
-msgstr "流不支持定位(seek)"
+msgstr "流不支持定位"
 
 #: ../gio/gfileinputstream.c:369
 msgid "Truncate not allowed on input stream"
@@ -1471,11 +1474,695 @@ 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:1215 ../gio/giostream.c:310
-#: ../gio/goutputstream.c:1668
+#: ../gio/ginputstream.c:1218 ../gio/giostream.c:310
+#: ../gio/goutputstream.c:1670
 msgid "Stream has outstanding operation"
 msgstr "流有异常操作"
 
+#: ../gio/gio-tool.c:142
+msgid "Copy with file"
+msgstr "复制文件时保留"
+
+#: ../gio/gio-tool.c:146
+msgid "Keep with file when moved"
+msgstr "移动时与文件一起"
+
+#: ../gio/gio-tool.c:187
+msgid "'version' takes no arguments"
+msgstr "“version”不接受参数"
+
+#: ../gio/gio-tool.c:189 ../gio/gio-tool.c:205 ../glib/goption.c:857
+msgid "Usage:"
+msgstr "用法:"
+
+#: ../gio/gio-tool.c:192
+msgid "Print version information and exit."
+msgstr "打印版本信息并退出。"
+
+#: ../gio/gio-tool.c:208
+msgid "Commands:"
+msgstr "命令:"
+
+#: ../gio/gio-tool.c:211
+msgid "Concatenate files to standard output"
+msgstr "串接文件,写到标准输出"
+
+#: ../gio/gio-tool.c:212
+msgid "Copy one or more files"
+msgstr "复制文件"
+
+#: ../gio/gio-tool.c:213
+msgid "Show information about locations"
+msgstr "显示关于位置的信息"
+
+#: ../gio/gio-tool.c:214
+msgid "List the contents of locations"
+msgstr "列出某位置的内容"
+
+#: ../gio/gio-tool.c:215
+msgid "Get or set the handler for a mimetype"
+msgstr "获取或设置某种 MIME 类型的处理程序"
+
+#: ../gio/gio-tool.c:216
+msgid "Create directories"
+msgstr "创建目录"
+
+#: ../gio/gio-tool.c:217
+msgid "Monitor files and directories for changes"
+msgstr "监视文件和目录更改"
+
+#: ../gio/gio-tool.c:218
+msgid "Mount or unmount the locations"
+msgstr "挂载或卸载位置"
+
+#: ../gio/gio-tool.c:219
+msgid "Move one or more files"
+msgstr "移动文件"
+
+#: ../gio/gio-tool.c:220
+msgid "Open files with the default application"
+msgstr "用默认应用打开文件"
+
+#: ../gio/gio-tool.c:221
+msgid "Rename a file"
+msgstr "重命名文件"
+
+#: ../gio/gio-tool.c:222
+msgid "Delete one or more files"
+msgstr "删除文件"
+
+#: ../gio/gio-tool.c:223
+msgid "Read from standard input and save"
+msgstr "从标准输入读取并保存"
+
+#: ../gio/gio-tool.c:224
+msgid "Set a file attribute"
+msgstr "设置文件属性"
+
+#: ../gio/gio-tool.c:225
+msgid "Move files or directories to the trash"
+msgstr "移动文件或目录到回收站"
+
+#: ../gio/gio-tool.c:226
+msgid "Lists the contents of locations in a tree"
+msgstr "在树中列出某位置的内容"
+
+#: ../gio/gio-tool.c:228
+#, c-format
+msgid "Use %s to get detailed help.\n"
+msgstr "使用 %s 以获取详细帮助\n"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-cat.c:124 ../gio/gio-tool-info.c:278
+#: ../gio/gio-tool-list.c:165 ../gio/gio-tool-mkdir.c:48
+#: ../gio/gio-tool-monitor.c:37 ../gio/gio-tool-monitor.c:39
+#: ../gio/gio-tool-monitor.c:41 ../gio/gio-tool-monitor.c:43
+#: ../gio/gio-tool-monitor.c:202 ../gio/gio-tool-mount.c:1132
+#: ../gio/gio-tool-open.c:45 ../gio/gio-tool-remove.c:48
+#: ../gio/gio-tool-rename.c:45 ../gio/gio-tool-set.c:89
+#: ../gio/gio-tool-trash.c:81 ../gio/gio-tool-tree.c:239
+msgid "LOCATION"
+msgstr "位置"
+
+#: ../gio/gio-tool-cat.c:129
+msgid "Concatenate files and print to standard output."
+msgstr "串接文件,写到标准输出。"
+
+#: ../gio/gio-tool-cat.c:131
+msgid ""
+"gio cat works just like the traditional cat utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location."
+msgstr ""
+"glib cat 如传统 cat 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-cat.c:151
+msgid "No files given"
+msgstr "未给出文件"
+
+#: ../gio/gio-tool-copy.c:42 ../gio/gio-tool-move.c:38
+msgid "No target directory"
+msgstr "无目标目录"
+
+#: ../gio/gio-tool-copy.c:43 ../gio/gio-tool-move.c:39
+msgid "Show progress"
+msgstr "显示进度"
+
+#: ../gio/gio-tool-copy.c:44 ../gio/gio-tool-move.c:40
+msgid "Prompt before overwrite"
+msgstr "覆盖前提示"
+
+#: ../gio/gio-tool-copy.c:45
+msgid "Preserve all attributes"
+msgstr "保留所有属性"
+
+#: ../gio/gio-tool-copy.c:46 ../gio/gio-tool-move.c:41
+#: ../gio/gio-tool-save.c:49
+msgid "Backup existing destination files"
+msgstr "备份已存在的目标文件"
+
+#: ../gio/gio-tool-copy.c:47
+msgid "Never follow symbolic links"
+msgstr "从不跟随符号链接"
+
+#: ../gio/gio-tool-copy.c:72 ../gio/gio-tool-move.c:67
+#, c-format
+msgid "Transferred %s out of %s (%s/s)"
+msgstr "已复制 %2$s 中的 %1$s(%3$s/秒)"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+msgid "SOURCE"
+msgstr "源头"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-copy.c:98 ../gio/gio-tool-move.c:94
+#: ../gio/gio-tool-save.c:165
+msgid "DESTINATION"
+msgstr "目标"
+
+#: ../gio/gio-tool-copy.c:103
+msgid "Copy one or more files from SOURCE to DESTINATION."
+msgstr "将一个或多个文件从源头复制到目标"
+
+#: ../gio/gio-tool-copy.c:105
+msgid ""
+"gio copy is similar to the traditional cp utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location."
+msgstr ""
+"glib copy 如传统 cp 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-copy.c:143
+#, c-format
+msgid "Destination %s is not a directory"
+msgstr "目标“%s”不是目录"
+
+#: ../gio/gio-tool-copy.c:187 ../gio/gio-tool-move.c:181
+#, c-format
+msgid "%s: overwrite '%s'? "
+msgstr "%s:要覆盖“%s”吗?"
+
+#: ../gio/gio-tool-info.c:34
+msgid "List writable attributes"
+msgstr "列出可写属性"
+
+#: ../gio/gio-tool-info.c:35
+msgid "Get file system info"
+msgstr "读取文件系统信息"
+
+#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+msgid "The attributes to get"
+msgstr "要获取的属性"
+
+#: ../gio/gio-tool-info.c:36 ../gio/gio-tool-list.c:35
+msgid "ATTRIBUTES"
+msgstr "属性"
+
+#: ../gio/gio-tool-info.c:37 ../gio/gio-tool-list.c:38 ../gio/gio-tool-set.c:34
+msgid "Don't follow symbolic links"
+msgstr "不要跟随符号链接"
+
+#: ../gio/gio-tool-info.c:75
+#, c-format
+msgid "attributes:\n"
+msgstr "属性:\n"
+
+#. Translators: This is a noun and represents and attribute of a file
+#: ../gio/gio-tool-info.c:127
+#, c-format
+msgid "display name: %s\n"
+msgstr "显示名称:%s\n"
+
+#. Translators: This is a noun and represents and attribute of a file
+#: ../gio/gio-tool-info.c:132
+#, c-format
+msgid "edit name: %s\n"
+msgstr "编辑名称:%s\n"
+
+#: ../gio/gio-tool-info.c:138
+#, c-format
+msgid "name: %s\n"
+msgstr "名称:%s\n"
+
+#: ../gio/gio-tool-info.c:145
+#, c-format
+msgid "type: %s\n"
+msgstr "类型:%s\n"
+
+#: ../gio/gio-tool-info.c:151
+#, c-format
+msgid "size: "
+msgstr "大小:"
+
+#: ../gio/gio-tool-info.c:156
+#, c-format
+msgid "hidden\n"
+msgstr "隐藏\n"
+
+#: ../gio/gio-tool-info.c:159
+#, c-format
+msgid "uri: %s\n"
+msgstr "uri:%s\n"
+
+#: ../gio/gio-tool-info.c:221
+#, c-format
+msgid "Error getting writable attributes: %s\n"
+msgstr "获取可写属性出错:%s\n"
+
+#: ../gio/gio-tool-info.c:226
+#, c-format
+msgid "Settable attributes:\n"
+msgstr "可设置的属性:\n"
+
+#: ../gio/gio-tool-info.c:249
+#, c-format
+msgid "Writable attribute namespaces:\n"
+msgstr "可写的属性命名空间:\n"
+
+#: ../gio/gio-tool-info.c:283
+msgid "Show information about locations."
+msgstr "显示位置信息。"
+
+#: ../gio/gio-tool-info.c:285
+msgid ""
+"gio info is similar to the traditional ls utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location. File attributes can\n"
+"be specified with their GIO name, e.g. standard::icon, or just by\n"
+"namespace, e.g. unix, or by '*', which matches all attributes"
+msgstr ""
+"glib info 如传统 ls 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/file.txt 之类的位置。要指定\n"
+"文件属性,可使用其 GIO 名字(如 standard::icon),也可以使用命名\n"
+"空间(如 unix),也可使用“*”匹配全部。"
+
+#: ../gio/gio-tool-info.c:307 ../gio/gio-tool-mkdir.c:74
+msgid "No locations given"
+msgstr "未给出位置"
+
+#: ../gio/gio-tool-list.c:36 ../gio/gio-tool-tree.c:32
+msgid "Show hidden files"
+msgstr "显示隐藏文件"
+
+#: ../gio/gio-tool-list.c:37
+msgid "Use a long listing format"
+msgstr "使用长列表格式"
+
+#: ../gio/gio-tool-list.c:39
+msgid "Print full URIs"
+msgstr "显示完整 URI"
+
+#: ../gio/gio-tool-list.c:170
+msgid "List the contents of the locations."
+msgstr "列出位置中的内容。"
+
+#: ../gio/gio-tool-list.c:172
+msgid ""
+"gio list is similar to the traditional ls utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location. File attributes can\n"
+"be specified with their GIO name, e.g. standard::icon"
+msgstr ""
+"glib list 如传统 ls 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/file.txt 之类的位置。要指定\n"
+"文件属性,可使用其 GIO 名字(如 standard::icon)。"
+
+#. Translators: commandline placeholder
+#: ../gio/gio-tool-mime.c:71
+msgid "MIMETYPE"
+msgstr "MIME 类型"
+
+#: ../gio/gio-tool-mime.c:71
+msgid "HANDLER"
+msgstr "处理程序"
+
+#: ../gio/gio-tool-mime.c:76
+msgid "Get or set the handler for a mimetype."
+msgstr "获取或设置某一 MIME 类型的处理程序。"
+
+#: ../gio/gio-tool-mime.c:78
+msgid ""
+"If no handler is given, lists registered and recommended applications\n"
+"for the mimetype. If a handler is given, it is set as the default\n"
+"handler for the mimetype."
+msgstr ""
+"如果没有给定的处理程序,列出 MIME 类型已注册和推荐的\n"
+"应用程序。如果已给定处理程序,它将被设为 MIME 类型的\n"
+"默认应用程序。"
+
+#: ../gio/gio-tool-mime.c:98
+msgid "Must specify a single mimetype, and maybe a handler"
+msgstr "必须指定一个 MIME 类型,也可同时指定处理程序"
+
+#: ../gio/gio-tool-mime.c:113
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "“%s”未设置默认应用程序\n"
+
+#: ../gio/gio-tool-mime.c:119
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "用于“%s”的默认应用程序:%s\n"
+
+#: ../gio/gio-tool-mime.c:124
+#, c-format
+msgid "Registered applications:\n"
+msgstr "已注册的应用程序:\n"
+
+#: ../gio/gio-tool-mime.c:126
+#, c-format
+msgid "No registered applications\n"
+msgstr "无已注册的应用程序\n"
+
+#: ../gio/gio-tool-mime.c:137
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "推荐的应用程序:\n"
+
+#: ../gio/gio-tool-mime.c:139
+#, c-format
+msgid "No recommended applications\n"
+msgstr "无推荐的应用程序\n"
+
+#: ../gio/gio-tool-mime.c:159
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "读取处理程序“%s”的信息失败\n"
+
+#: ../gio/gio-tool-mime.c:165
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "将“%s”设置为“%s”的默认处理程序失败:%s\n"
+
+#: ../gio/gio-tool-mkdir.c:31
+msgid "Create parent directories"
+msgstr "创建父级目录"
+
+#: ../gio/gio-tool-mkdir.c:52
+msgid "Create directories."
+msgstr "创建目录。"
+
+#: ../gio/gio-tool-mkdir.c:54
+msgid ""
+"gio mkdir is similar to the traditional mkdir utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/mydir as location."
+msgstr ""
+"glib mkdir 如传统 mkdir 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/mydir 之类的位置。"
+
+#: ../gio/gio-tool-monitor.c:37
+msgid "Monitor a directory (default: depends on type)"
+msgstr "监视目录(默认:取决于类型)"
+
+#: ../gio/gio-tool-monitor.c:39
+msgid "Monitor a file (default: depends on type)"
+msgstr "监视文件(默认:取决于类型)"
+
+#: ../gio/gio-tool-monitor.c:41
+msgid "Monitor a file directly (notices changes made via hardlinks)"
+msgstr "直接监视文件(通过硬链接通知更改)"
+
+#: ../gio/gio-tool-monitor.c:43
+msgid "Monitors a file directly, but doesn't report changes"
+msgstr "直接监视文件,但不报告更改"
+
+#: ../gio/gio-tool-monitor.c:45
+msgid "Report moves and renames as simple deleted/created events"
+msgstr "将移动和重命名报告为简单的删除/创建事件"
+
+#: ../gio/gio-tool-monitor.c:47
+msgid "Watch for mount events"
+msgstr "检测挂载事件"
+
+#: ../gio/gio-tool-monitor.c:207
+msgid "Monitor files or directories for changes."
+msgstr "监视文件和目录更改。"
+
+#: ../gio/gio-tool-mount.c:58
+msgid "Mount as mountable"
+msgstr "挂载,作为可挂载设备"
+
+#: ../gio/gio-tool-mount.c:59
+msgid "Mount volume with device file"
+msgstr "使用设备文件挂载卷"
+
+#: ../gio/gio-tool-mount.c:59
+msgid "DEVICE"
+msgstr "设备"
+
+#: ../gio/gio-tool-mount.c:60
+msgid "Unmount"
+msgstr "卸载"
+
+#: ../gio/gio-tool-mount.c:61
+msgid "Eject"
+msgstr "弹出"
+
+#: ../gio/gio-tool-mount.c:62
+msgid "Unmount all mounts with the given scheme"
+msgstr "卸载所有带有指定方案的挂载点"
+
+#: ../gio/gio-tool-mount.c:62
+msgid "SCHEME"
+msgstr "方案"
+
+#: ../gio/gio-tool-mount.c:63
+msgid "Ignore outstanding file operations when unmounting or ejecting"
+msgstr "卸载或弹出时忽略正在进行的文件操作"
+
+#: ../gio/gio-tool-mount.c:64
+msgid "Use an anonymous user when authenticating"
+msgstr "认证时使用匿名用户"
+
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../gio/gio-tool-mount.c:66
+msgid "List"
+msgstr "列出"
+
+#: ../gio/gio-tool-mount.c:67
+msgid "Monitor events"
+msgstr "监视事件"
+
+#: ../gio/gio-tool-mount.c:68
+msgid "Show extra information"
+msgstr "显示附加选项"
+
+#: ../gio/gio-tool-mount.c:246 ../gio/gio-tool-mount.c:276
+#, c-format
+msgid "Error mounting location: Anonymous access denied\n"
+msgstr "挂载位置出错:匿名访问被拒绝\n"
+
+#: ../gio/gio-tool-mount.c:248 ../gio/gio-tool-mount.c:278
+#, c-format
+msgid "Error mounting location: %s\n"
+msgstr "挂载位置出错:%s\n"
+
+#: ../gio/gio-tool-mount.c:341
+#, c-format
+msgid "Error unmounting mount: %s\n"
+msgstr "卸载挂载点出错:%s\n"
+
+#: ../gio/gio-tool-mount.c:366 ../gio/gio-tool-mount.c:419
+#, c-format
+msgid "Error finding enclosing mount: %s\n"
+msgstr "寻找闭合挂载出错:%s\n"
+
+#: ../gio/gio-tool-mount.c:394
+#, c-format
+msgid "Error ejecting mount: %s\n"
+msgstr "弹出挂载出错:%s\n"
+
+#: ../gio/gio-tool-mount.c:875
+#, c-format
+msgid "Error mounting %s: %s\n"
+msgstr "挂载 %s 出错:%s\n"
+
+#: ../gio/gio-tool-mount.c:891
+#, c-format
+msgid "Mounted %s at %s\n"
+msgstr "已将 %s 挂载为 %s\n"
+
+#: ../gio/gio-tool-mount.c:941
+#, c-format
+msgid "No volume for device file %s\n"
+msgstr "设备文件 %s 中无卷\n"
+
+#: ../gio/gio-tool-mount.c:1136
+msgid "Mount or unmount the locations."
+msgstr "挂载或卸载位置。"
+
+#: ../gio/gio-tool-move.c:42
+msgid "Don't use copy and delete fallback"
+msgstr "不要使用复制和删除替代方案"
+
+#: ../gio/gio-tool-move.c:99
+msgid "Move one or more files from SOURCE to DEST."
+msgstr "将一个或多个文件从源头复制到目标。"
+
+#: ../gio/gio-tool-move.c:101
+msgid ""
+"gio move is similar to the traditional mv utility, but using GIO\n"
+"locations instead of local files: for example, you can use something\n"
+"like smb://server/resource/file.txt as location"
+msgstr ""
+"glib mv 如传统 mv 程序那样工作,但使用 GIO 位置而非本地文件:\n"
+"例如,你可以指定 smb://server/resource/file.txt 之类的位置。"
+
+#: ../gio/gio-tool-move.c:139
+#, c-format
+msgid "Target %s is not a directory"
+msgstr "目标 %s 不是目录"
+
+#: ../gio/gio-tool-open.c:50
+msgid ""
+"Open files with the default application that\n"
+"is registered to handle files of this type."
+msgstr "使用处理此类文件的默认应用程序打开文件。"
+
+#: ../gio/gio-tool-open.c:69
+msgid "No files to open"
+msgstr "没有要打开的文件"
+
+#: ../gio/gio-tool-remove.c:31 ../gio/gio-tool-trash.c:31
+msgid "Ignore nonexistent files, never prompt"
+msgstr "忽略不存在的文件,从不提示"
+
+#: ../gio/gio-tool-remove.c:52
+msgid "Delete the given files."
+msgstr "删除指定文件。"
+
+#: ../gio/gio-tool-remove.c:70
+msgid "No files to delete"
+msgstr "没有要删除的文件"
+
+#: ../gio/gio-tool-rename.c:45
+msgid "NAME"
+msgstr "名称"
+
+#: ../gio/gio-tool-rename.c:50
+msgid "Rename a file."
+msgstr "重命名文件。"
+
+#: ../gio/gio-tool-rename.c:68
+msgid "Missing argument"
+msgstr "缺少参数"
+
+#: ../gio/gio-tool-rename.c:73 ../gio/gio-tool-save.c:192
+#: ../gio/gio-tool-set.c:134
+msgid "Too many arguments"
+msgstr "参数过多"
+
+#: ../gio/gio-tool-rename.c:91
+#, c-format
+msgid "Rename successful. New uri: %s\n"
+msgstr "重命名成功。新 uri:%s\n"
+
+#: ../gio/gio-tool-save.c:50
+msgid "Only create if not existing"
+msgstr "仅不存在时创建"
+
+#: ../gio/gio-tool-save.c:51
+msgid "Append to end of file"
+msgstr "追加到文件末尾"
+
+#: ../gio/gio-tool-save.c:52
+msgid "When creating, restrict access to the current user"
+msgstr "创建时限制当前用户的访问"
+
+#: ../gio/gio-tool-save.c:53
+msgid "When replacing, replace as if the destination did not exist"
+msgstr "替换时假定目标不存在"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:55
+msgid "Print new etag at end"
+msgstr "在末尾打印新 etag"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:57
+msgid "The etag of the file being overwritten"
+msgstr "文件的 etag 被覆盖"
+
+#: ../gio/gio-tool-save.c:57
+msgid "ETAG"
+msgstr "ETAG"
+
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../gio/gio-tool-save.c:145
+#, c-format
+msgid "Etag not available\n"
+msgstr "ETAG 不可用\n"
+
+#: ../gio/gio-tool-save.c:168
+msgid "Read from standard input and save to DEST."
+msgstr "读取标准输入并保存到目标。"
+
+#: ../gio/gio-tool-save.c:186
+msgid "No destination given"
+msgstr "未给出目标"
+
+#: ../gio/gio-tool-set.c:33
+msgid "Type of the attribute"
+msgstr "属性类型"
+
+#: ../gio/gio-tool-set.c:33
+msgid "TYPE"
+msgstr "类型"
+
+#: ../gio/gio-tool-set.c:89
+msgid "ATTRIBUTE"
+msgstr "属性"
+
+#: ../gio/gio-tool-set.c:89
+msgid "VALUE"
+msgstr "值"
+
+#: ../gio/gio-tool-set.c:93
+msgid "Set a file attribute of LOCATION."
+msgstr "设置位置的文件属性。"
+
+#: ../gio/gio-tool-set.c:111
+msgid "Location not specified"
+msgstr "未指定位置"
+
+#: ../gio/gio-tool-set.c:119
+msgid "Attribute not specified"
+msgstr "未指定属性"
+
+#: ../gio/gio-tool-set.c:128
+msgid "Value not specified"
+msgstr "未指定值"
+
+#: ../gio/gio-tool-set.c:176
+#, c-format
+msgid "Invalid attribute type %s\n"
+msgstr "无效的属性类型 %s\n"
+
+#: ../gio/gio-tool-set.c:189
+#, c-format
+msgid "Error setting attribute: %s\n"
+msgstr "设置属性出错:%s\n"
+
+#: ../gio/gio-tool-trash.c:32
+msgid "Empty the trash"
+msgstr "清空回收站"
+
+#: ../gio/gio-tool-trash.c:86
+msgid "Move files or directories to the trash."
+msgstr "将文件或目录移动到回收站。"
+
+#: ../gio/gio-tool-tree.c:33
+msgid "Follow symbolic links, mounts and shortcuts"
+msgstr "跟踪符号链接、挂载和快捷方式"
+
+#: ../gio/gio-tool-tree.c:244
+msgid "List contents of directories in a tree-like format."
+msgstr "使用树状格式列出目录内容。"
+
 #: ../gio/glib-compile-resources.c:142 ../gio/glib-compile-schemas.c:1491
 #, c-format
 msgid "Element <%s> not allowed inside <%s>"
@@ -1486,91 +2173,99 @@ msgstr "在 <%2$s> 中不允许元素 <%1$s>"
 msgid "Element <%s> not allowed at toplevel"
 msgstr "顶层中不允许元素 <%s>"
 
-#: ../gio/glib-compile-resources.c:236
+#: ../gio/glib-compile-resources.c:237
 #, c-format
 msgid "File %s appears multiple times in the resource"
 msgstr "文件 %s 在资源中出现了多次"
 
-#: ../gio/glib-compile-resources.c:247
+#: ../gio/glib-compile-resources.c:248
 #, c-format
 msgid "Failed to locate '%s' in any source directory"
 msgstr "在所有源目录中定位“%s”失败"
 
-#: ../gio/glib-compile-resources.c:258
+#: ../gio/glib-compile-resources.c:259
 #, c-format
 msgid "Failed to locate '%s' in current directory"
 msgstr "在当前目录定位“%s”失败"
 
-#: ../gio/glib-compile-resources.c:287
+#: ../gio/glib-compile-resources.c:290
 #, c-format
 msgid "Unknown processing option \"%s\""
 msgstr "未知的处理选项“%s”"
 
-#: ../gio/glib-compile-resources.c:305 ../gio/glib-compile-resources.c:351
+#: ../gio/glib-compile-resources.c:308 ../gio/glib-compile-resources.c:354
 #, c-format
 msgid "Failed to create temp file: %s"
 msgstr "创建临时文件失败:%s"
 
-#: ../gio/glib-compile-resources.c:379
+#: ../gio/glib-compile-resources.c:382
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "读取文件 %s 出错:%s"
 
-#: ../gio/glib-compile-resources.c:399
+#: ../gio/glib-compile-resources.c:402
 #, c-format
 msgid "Error compressing file %s"
 msgstr "压缩文件时出错:%s"
 
-#: ../gio/glib-compile-resources.c:467 ../gio/glib-compile-schemas.c:1603
+#: ../gio/glib-compile-resources.c:469 ../gio/glib-compile-schemas.c:1603
 #, c-format
 msgid "text may not appear inside <%s>"
 msgstr "<%s> 内不应出现文本"
 
-#: ../gio/glib-compile-resources.c:592
+#: ../gio/glib-compile-resources.c:621 ../gio/glib-compile-schemas.c:2037
+msgid "Show program version and exit"
+msgstr "显示程序版本并退出"
+
+#: ../gio/glib-compile-resources.c:622
 msgid "name of the output file"
 msgstr "输出文件名"
 
-#: ../gio/glib-compile-resources.c:593
+#: ../gio/glib-compile-resources.c:623
 msgid ""
 "The directories where files are to be read from (default to current "
 "directory)"
 msgstr "文件会被读出的目录(默认为当前目录)"
 
-#: ../gio/glib-compile-resources.c:593 ../gio/glib-compile-schemas.c:2036
-#: ../gio/glib-compile-schemas.c:2065
+#: ../gio/glib-compile-resources.c:623 ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-schemas.c:2067
 msgid "DIRECTORY"
 msgstr "DIRECTORY"
 
-#: ../gio/glib-compile-resources.c:594
+#: ../gio/glib-compile-resources.c:624
 msgid ""
 "Generate output in the format selected for by the target filename extension"
 msgstr "以目标文件扩展名所选择的格式生成输出"
 
-#: ../gio/glib-compile-resources.c:595
+#: ../gio/glib-compile-resources.c:625
 msgid "Generate source header"
 msgstr "生成源码头文件"
 
-#: ../gio/glib-compile-resources.c:596
+#: ../gio/glib-compile-resources.c:626
 msgid "Generate sourcecode used to link in the resource file into your code"
 msgstr "生成用于将资源文件链接到您的代码的源代码"
 
-#: ../gio/glib-compile-resources.c:597
+#: ../gio/glib-compile-resources.c:627
 msgid "Generate dependency list"
 msgstr "生成依赖关系列表"
 
-#: ../gio/glib-compile-resources.c:598
+#: ../gio/glib-compile-resources.c:628
+msgid "name of the dependency file to generate"
+msgstr "要生成的依赖文件名称"
+
+#: ../gio/glib-compile-resources.c:629
 msgid "Don't automatically create and register resource"
 msgstr "不要自动创建和注册资源"
 
-#: ../gio/glib-compile-resources.c:599
+#: ../gio/glib-compile-resources.c:630
 msgid "Don't export functions; declare them G_GNUC_INTERNAL"
 msgstr "不要导出函数;请将它们声明为 G_GNUC_INTERNAL"
 
-#: ../gio/glib-compile-resources.c:600
+#: ../gio/glib-compile-resources.c:631
 msgid "C identifier name used for the generated source code"
 msgstr "用于生成的源代码的 C 标识符名称"
 
-#: ../gio/glib-compile-resources.c:626
+#: ../gio/glib-compile-resources.c:657
 msgid ""
 "Compile a resource specification into a resource file.\n"
 "Resource specification files have the extension .gresource.xml,\n"
@@ -1580,7 +2275,7 @@ msgstr ""
 "资源规格文件以 .gresource.xml 为扩展名,\n"
 "资源文件以 .gresource 为扩展名。"
 
-#: ../gio/glib-compile-resources.c:642
+#: ../gio/glib-compile-resources.c:679
 #, c-format
 msgid "You should give exactly one file name\n"
 msgstr "您应该给出惟一的文件名\n"
@@ -1794,23 +2489,23 @@ msgid ""
 "list of valid choices"
 msgstr "覆盖文件 %3$s 中方案 %2$s 的键 %1$s 的覆盖的值不在有效值列表内"
 
-#: ../gio/glib-compile-schemas.c:2036
+#: ../gio/glib-compile-schemas.c:2038
 msgid "where to store the gschemas.compiled file"
 msgstr "gschemas.compiled 文件存储于何处"
 
-#: ../gio/glib-compile-schemas.c:2037
+#: ../gio/glib-compile-schemas.c:2039
 msgid "Abort on any errors in schemas"
 msgstr "在方案出现任何错误时中止"
 
-#: ../gio/glib-compile-schemas.c:2038
+#: ../gio/glib-compile-schemas.c:2040
 msgid "Do not write the gschema.compiled file"
 msgstr "不要对 gschema.compiled 进行写操作"
 
-#: ../gio/glib-compile-schemas.c:2039
+#: ../gio/glib-compile-schemas.c:2041
 msgid "Do not enforce key name restrictions"
 msgstr "不要强制键名的限制"
 
-#: ../gio/glib-compile-schemas.c:2068
+#: ../gio/glib-compile-schemas.c:2070
 msgid ""
 "Compile all GSettings schema files into a schema cache.\n"
 "Schema files are required to have the extension .gschema.xml,\n"
@@ -1820,141 +2515,153 @@ msgstr ""
 "要使用扩展 .gschema.xml,需要有方案文件,\n"
 "缓存文件被称为 gschemas.compiled。"
 
-#: ../gio/glib-compile-schemas.c:2084
+#: ../gio/glib-compile-schemas.c:2092
 #, c-format
 msgid "You should give exactly one directory name\n"
 msgstr "您应该给出且只能给出一个目录名\n"
 
-#: ../gio/glib-compile-schemas.c:2123
+#: ../gio/glib-compile-schemas.c:2131
 #, c-format
 msgid "No schema files found: "
 msgstr "没有找到方案文件:"
 
-#: ../gio/glib-compile-schemas.c:2126
+#: ../gio/glib-compile-schemas.c:2134
 #, c-format
 msgid "doing nothing.\n"
 msgstr "什么都没做。\n"
 
-#: ../gio/glib-compile-schemas.c:2129
+#: ../gio/glib-compile-schemas.c:2137
 #, c-format
 msgid "removed existing output file.\n"
 msgstr "已删除存在的输出文件。\n"
 
-#: ../gio/glocalfile.c:635 ../gio/win32/gwinhttpfile.c:420
+#: ../gio/glocalfile.c:642 ../gio/win32/gwinhttpfile.c:420
 #, c-format
 msgid "Invalid filename %s"
 msgstr "无效的文件名 %s"
 
-#: ../gio/glocalfile.c:1012
+#: ../gio/glocalfile.c:1036
 #, c-format
-msgid "Error getting filesystem info: %s"
-msgstr "读取文件系统信息时出错:%s"
+msgid "Error getting filesystem info for %s: %s"
+msgstr "读取 %s 文件系统信息时出错:%s"
 
-#: ../gio/glocalfile.c:1180
+#: ../gio/glocalfile.c:1175
+#, c-format
+msgid "Containing mount for file %s not found"
+msgstr "找不到文件 %s 包含的挂载"
+
+#: ../gio/glocalfile.c:1198
 msgid "Can't rename root directory"
 msgstr "无法重命名根目录"
 
-#: ../gio/glocalfile.c:1200 ../gio/glocalfile.c:1226
+#: ../gio/glocalfile.c:1216 ../gio/glocalfile.c:1239
 #, c-format
-msgid "Error renaming file: %s"
-msgstr "重命名文件时出错:%s"
+msgid "Error renaming file %s: %s"
+msgstr "重命名文件 %s 时出错:%s"
 
-#: ../gio/glocalfile.c:1209
+#: ../gio/glocalfile.c:1223
 msgid "Can't rename file, filename already exists"
 msgstr "无法重命名文件,该文件名已存在"
 
-#: ../gio/glocalfile.c:1222 ../gio/glocalfile.c:2249 ../gio/glocalfile.c:2278
-#: ../gio/glocalfile.c:2438 ../gio/glocalfileoutputstream.c:549
+#: ../gio/glocalfile.c:1236 ../gio/glocalfile.c:2250 ../gio/glocalfile.c:2278
+#: ../gio/glocalfile.c:2435 ../gio/glocalfileoutputstream.c:549
 msgid "Invalid filename"
 msgstr "无效的文件名"
 
-#: ../gio/glocalfile.c:1389 ../gio/glocalfile.c:1413
-msgid "Can't open directory"
-msgstr "无法打开目录"
-
-#: ../gio/glocalfile.c:1397
+#: ../gio/glocalfile.c:1403 ../gio/glocalfile.c:1418
 #, c-format
-msgid "Error opening file: %s"
-msgstr "打开文件时出错:%s"
+msgid "Error opening file %s: %s"
+msgstr "打开文件 %s 时出错:%s"
 
-#: ../gio/glocalfile.c:1538
+#: ../gio/glocalfile.c:1543
 #, c-format
-msgid "Error removing file: %s"
-msgstr "删除文件时出错:%s"
+msgid "Error removing file %s: %s"
+msgstr "删除文件 %s 时出错:%s"
 
-#: ../gio/glocalfile.c:1922
+#: ../gio/glocalfile.c:1926
 #, c-format
-msgid "Error trashing file: %s"
-msgstr "将文件放到回收站时出错:%s"
+msgid "Error trashing file %s: %s"
+msgstr "将文件 %s 放到回收站时出错:%s"
 
-#: ../gio/glocalfile.c:1945
+#: ../gio/glocalfile.c:1949
 #, c-format
 msgid "Unable to create trash dir %s: %s"
 msgstr "无法创建回收站目录 %s:%s"
 
-#: ../gio/glocalfile.c:1966
-msgid "Unable to find toplevel directory for trash"
-msgstr "找不到回收站的顶级目录"
+#: ../gio/glocalfile.c:1969
+#, c-format
+msgid "Unable to find toplevel directory to trash %s"
+msgstr "找不到回收站 %s 的顶级目录"
 
-#: ../gio/glocalfile.c:2045 ../gio/glocalfile.c:2065
-msgid "Unable to find or create trash directory"
-msgstr "无法找到或创建回收站目录"
+#: ../gio/glocalfile.c:2048 ../gio/glocalfile.c:2068
+#, c-format
+msgid "Unable to find or create trash directory for %s"
+msgstr "无法为 %s 找到或创建回收站目录"
 
-#: ../gio/glocalfile.c:2099
+#: ../gio/glocalfile.c:2102
 #, c-format
-msgid "Unable to create trashing info file: %s"
-msgstr "创建回收站信息文件失败:%s"
+msgid "Unable to create trashing info file for %s: %s"
+msgstr "为 %s 创建回收站信息文件失败:%s"
 
-#: ../gio/glocalfile.c:2157 ../gio/glocalfile.c:2162 ../gio/glocalfile.c:2219
-#: ../gio/glocalfile.c:2226
+#: ../gio/glocalfile.c:2161
 #, c-format
-msgid "Unable to trash file: %s"
-msgstr "无法将文件移动到回收站:%s"
+msgid "Unable to trash file %s across filesystem boundaries"
+msgstr "无法跨越文件系统边界将文件 %s 移动到回收站"
 
-#: ../gio/glocalfile.c:2227 ../glib/gregex.c:281
-msgid "internal error"
-msgstr "内部错误"
+#: ../gio/glocalfile.c:2165 ../gio/glocalfile.c:2221
+#, c-format
+msgid "Unable to trash file %s: %s"
+msgstr "无法将文件 %s 移动到回收站:%s"
+
+#: ../gio/glocalfile.c:2227
+#, c-format
+msgid "Unable to trash file %s"
+msgstr "无法将文件 %s 移动到回收站"
 
 #: ../gio/glocalfile.c:2253
 #, c-format
-msgid "Error creating directory: %s"
-msgstr "创建目录时出错:%s"
+msgid "Error creating directory %s: %s"
+msgstr "创建目录 %s 时出错:%s"
 
 #: ../gio/glocalfile.c:2282
 #, c-format
 msgid "Filesystem does not support symbolic links"
 msgstr "文件系统不支持符号链接"
 
-#: ../gio/glocalfile.c:2286
+#: ../gio/glocalfile.c:2285
 #, c-format
-msgid "Error making symbolic link: %s"
-msgstr "创建符号链接时出错:%s"
+msgid "Error making symbolic link %s: %s"
+msgstr "创建符号链接 %s 时出错:%s"
+
+#: ../gio/glocalfile.c:2291 ../glib/gfileutils.c:2064
+msgid "Symbolic links not supported"
+msgstr "不支持符号链接"
 
-#: ../gio/glocalfile.c:2348 ../gio/glocalfile.c:2442
+#: ../gio/glocalfile.c:2346 ../gio/glocalfile.c:2381 ../gio/glocalfile.c:2438
 #, c-format
-msgid "Error moving file: %s"
-msgstr "移动文件时出错:%s"
+msgid "Error moving file %s: %s"
+msgstr "移动文件 %s 时出错:%s"
 
-#: ../gio/glocalfile.c:2371
+#: ../gio/glocalfile.c:2369
 msgid "Can't move directory over directory"
 msgstr "无法将目录移动到目录"
 
-#: ../gio/glocalfile.c:2398 ../gio/glocalfileoutputstream.c:925
+#: ../gio/glocalfile.c:2395 ../gio/glocalfileoutputstream.c:925
 #: ../gio/glocalfileoutputstream.c:939 ../gio/glocalfileoutputstream.c:954
-#: ../gio/glocalfileoutputstream.c:970 ../gio/glocalfileoutputstream.c:984
+#: ../gio/glocalfileoutputstream.c:971 ../gio/glocalfileoutputstream.c:985
 msgid "Backup file creation failed"
 msgstr "备份文件创建失败"
 
-#: ../gio/glocalfile.c:2417
+#: ../gio/glocalfile.c:2414
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "移除目标文件出错:%s"
 
-#: ../gio/glocalfile.c:2431
+#: ../gio/glocalfile.c:2428
 msgid "Move between mounts not supported"
 msgstr "不支持在挂载之间移动"
 
-#: ../gio/glocalfile.c:2623
+#: ../gio/glocalfile.c:2619
 #, c-format
 msgid "Could not determine the disk usage of %s: %s"
 msgstr "无法确定 %s 的磁盘使用情况:%s"
@@ -1974,7 +2681,7 @@ msgstr "无效的扩展属性名"
 #: ../gio/glocalfileinfo.c:775
 #, c-format
 msgid "Error setting extended attribute '%s': %s"
-msgstr "设置扩展属性“%s”出错:%s"
+msgstr "设置扩展属性“%s”时出错:%s"
 
 #: ../gio/glocalfileinfo.c:1575
 msgid " (invalid encoding)"
@@ -1983,7 +2690,7 @@ msgstr " (无效的编码)"
 #: ../gio/glocalfileinfo.c:1766 ../gio/glocalfileoutputstream.c:803
 #, c-format
 msgid "Error when getting information for file '%s': %s"
-msgstr "获取文件“%s”的信息出错:%s"
+msgstr "获取文件“%s”的信息时出错:%s"
 
 #: ../gio/glocalfileinfo.c:2017
 #, c-format
@@ -2060,7 +2767,7 @@ msgstr "读取文件出错:%s"
 
 #: ../gio/glocalfileinputstream.c:199 ../gio/glocalfileinputstream.c:211
 #: ../gio/glocalfileinputstream.c:225 ../gio/glocalfileinputstream.c:333
-#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1002
+#: ../gio/glocalfileoutputstream.c:456 ../gio/glocalfileoutputstream.c:1003
 #, c-format
 msgid "Error seeking in file: %s"
 msgstr "在文件中定位时出错:%s"
@@ -2096,16 +2803,16 @@ msgstr "创建备份拷贝:%s"
 msgid "Error renaming temporary file: %s"
 msgstr "重命名临时文件出错:%s"
 
-#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1053
+#: ../gio/glocalfileoutputstream.c:502 ../gio/glocalfileoutputstream.c:1054
 #, c-format
 msgid "Error truncating file: %s"
 msgstr "截断文件出错:%s"
 
 #: ../gio/glocalfileoutputstream.c:555 ../gio/glocalfileoutputstream.c:785
-#: ../gio/glocalfileoutputstream.c:1034 ../gio/gsubprocess.c:360
+#: ../gio/glocalfileoutputstream.c:1035 ../gio/gsubprocess.c:360
 #, c-format
 msgid "Error opening file '%s': %s"
-msgstr "打开文件“%s”出错:%s"
+msgstr "打开文件“%s”时出错:%s"
 
 #: ../gio/glocalfileoutputstream.c:816
 msgid "Target file is a directory"
@@ -2119,20 +2826,20 @@ msgstr "目标文件不是普通文件"
 msgid "The file was externally modified"
 msgstr "文件已经被其他程序修改"
 
-#: ../gio/glocalfileoutputstream.c:1018
+#: ../gio/glocalfileoutputstream.c:1019
 #, c-format
 msgid "Error removing old file: %s"
 msgstr "移除旧文件出错:%s"
 
-#: ../gio/gmemoryinputstream.c:471 ../gio/gmemoryoutputstream.c:771
+#: ../gio/gmemoryinputstream.c:474 ../gio/gmemoryoutputstream.c:772
 msgid "Invalid GSeekType supplied"
 msgstr "提供的 GSeekType 无效"
 
-#: ../gio/gmemoryinputstream.c:481
+#: ../gio/gmemoryinputstream.c:484
 msgid "Invalid seek request"
 msgstr "无效的搜寻请求"
 
-#: ../gio/gmemoryinputstream.c:505
+#: ../gio/gmemoryinputstream.c:508
 msgid "Cannot truncate GMemoryInputStream"
 msgstr "无法截断 GMemoryInputStream"
 
@@ -2150,11 +2857,11 @@ msgid ""
 "address space"
 msgstr "处理写入所需要的内存超过了可用的空间"
 
-#: ../gio/gmemoryoutputstream.c:781
+#: ../gio/gmemoryoutputstream.c:782
 msgid "Requested seek before the beginning of the stream"
 msgstr "请求的定位值在流的开始之前"
 
-#: ../gio/gmemoryoutputstream.c:796
+#: ../gio/gmemoryoutputstream.c:797
 msgid "Requested seek beyond the end of the stream"
 msgstr "请求的定位值在流的结束之后"
 
@@ -2184,14 +2891,14 @@ msgstr "挂载未实现“unmount”或“unmount_with_operation”"
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gmount.c:632
 msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
-msgstr "挂载未执行“eject”或“eject_with_operation”"
+msgstr "挂载未实现“eject”或“eject_with_operation”"
 
 #. Translators: This is an error
 #. * message for mount objects that
 #. * don't implement remount.
 #: ../gio/gmount.c:720
 msgid "mount doesn't implement \"remount\""
-msgstr "挂载没有实现“remount”"
+msgstr "挂载未实现“remount”"
 
 #. Translators: This is an error
 #. * message for mount objects that
@@ -2212,7 +2919,7 @@ msgstr "挂载未实现同步内容类型猜测"
 msgid "Hostname '%s' contains '[' but not ']'"
 msgstr "主机名“%s”包含“[”但是缺少“]”"
 
-#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:309
+#: ../gio/gnetworkmonitorbase.c:206 ../gio/gnetworkmonitorbase.c:310
 msgid "Network unreachable"
 msgstr "网络不可达"
 
@@ -2241,27 +2948,27 @@ msgstr "NetworkManager 版本太老"
 
 #: ../gio/goutputstream.c:212 ../gio/goutputstream.c:560
 msgid "Output stream doesn't implement write"
-msgstr "输出流未实现写入(write)"
+msgstr "输出流未实现写入"
 
-#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1222
+#: ../gio/goutputstream.c:521 ../gio/goutputstream.c:1224
 msgid "Source stream is already closed"
 msgstr "源流已经关闭"
 
-#: ../gio/gresolver.c:330 ../gio/gthreadedresolver.c:116
+#: ../gio/gresolver.c:333 ../gio/gthreadedresolver.c:116
 #: ../gio/gthreadedresolver.c:126
 #, c-format
 msgid "Error resolving '%s': %s"
-msgstr "解析“%s”出错:%s"
+msgstr "解析“%s”时出错:%s"
 
-#: ../gio/gresource.c:304 ../gio/gresource.c:555 ../gio/gresource.c:572
-#: ../gio/gresource.c:693 ../gio/gresource.c:762 ../gio/gresource.c:823
-#: ../gio/gresource.c:903 ../gio/gresourcefile.c:453 ../gio/gresourcefile.c:576
-#: ../gio/gresourcefile.c:713
+#: ../gio/gresource.c:595 ../gio/gresource.c:846 ../gio/gresource.c:863
+#: ../gio/gresource.c:987 ../gio/gresource.c:1059 ../gio/gresource.c:1132
+#: ../gio/gresource.c:1202 ../gio/gresourcefile.c:453
+#: ../gio/gresourcefile.c:576 ../gio/gresourcefile.c:713
 #, c-format
 msgid "The resource at '%s' does not exist"
-msgstr "位于 “%s”的资源不存在"
+msgstr "位于“%s”的资源不存在"
 
-#: ../gio/gresource.c:469
+#: ../gio/gresource.c:760
 #, c-format
 msgid "The resource at '%s' failed to decompress"
 msgstr "解压位于“%s”的资源失败"
@@ -2269,11 +2976,11 @@ msgstr "解压位于“%s”的资源失败"
 #: ../gio/gresourcefile.c:709
 #, c-format
 msgid "The resource at '%s' is not a directory"
-msgstr "“%s” 处的资源并非目录"
+msgstr "“%s”处的资源不是一个目录"
 
 #: ../gio/gresourcefile.c:917
 msgid "Input stream doesn't implement seek"
-msgstr "输入流未实现定位(seek)"
+msgstr "输入流未实现定位"
 
 #: ../gio/gresource-tool.c:494
 msgid "List sections containing resources in an elf FILE"
@@ -2365,7 +3072,7 @@ msgstr ""
 msgid "  SECTION   An (optional) elf section name\n"
 msgstr "  SECTION   ELF 段名(可选)\n"
 
-#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:639
+#: ../gio/gresource-tool.c:559 ../gio/gsettings-tool.c:654
 msgid "  COMMAND   The (optional) command to explain\n"
 msgstr "  COMMAND   要解释的命令(可选)\n"
 
@@ -2398,7 +3105,7 @@ msgid "  PATH      A resource path\n"
 msgstr "  PATH      资源路径\n"
 
 #: ../gio/gsettings-tool.c:51 ../gio/gsettings-tool.c:72
-#: ../gio/gsettings-tool.c:830
+#: ../gio/gsettings-tool.c:851
 #, c-format
 msgid "No such schema '%s'\n"
 msgstr "没有“%s”这个方案\n"
@@ -2433,38 +3140,38 @@ msgstr "路径必须以斜杠结束(/)\n"
 msgid "Path must not contain two adjacent slashes (//)\n"
 msgstr "路径中不能包含连续两个斜杠(//)\n"
 
-#: ../gio/gsettings-tool.c:481
+#: ../gio/gsettings-tool.c:489
 #, c-format
 msgid "The provided value is outside of the valid range\n"
 msgstr "提供的值不在有效范围内\n"
 
-#: ../gio/gsettings-tool.c:488
+#: ../gio/gsettings-tool.c:496
 #, c-format
 msgid "The key is not writable\n"
 msgstr "键不可写\n"
 
-#: ../gio/gsettings-tool.c:524
+#: ../gio/gsettings-tool.c:532
 msgid "List the installed (non-relocatable) schemas"
 msgstr "列出已安装的(不可重分配的)方案"
 
-#: ../gio/gsettings-tool.c:530
+#: ../gio/gsettings-tool.c:538
 msgid "List the installed relocatable schemas"
 msgstr "列出安装的可重分配的方案"
 
-#: ../gio/gsettings-tool.c:536
+#: ../gio/gsettings-tool.c:544
 msgid "List the keys in SCHEMA"
 msgstr "列出 SCHEMA 中的键"
 
-#: ../gio/gsettings-tool.c:537 ../gio/gsettings-tool.c:543
-#: ../gio/gsettings-tool.c:580
+#: ../gio/gsettings-tool.c:545 ../gio/gsettings-tool.c:551
+#: ../gio/gsettings-tool.c:594
 msgid "SCHEMA[:PATH]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:542
+#: ../gio/gsettings-tool.c:550
 msgid "List the children of SCHEMA"
 msgstr "列出 SCHEMA 的子对象"
 
-#: ../gio/gsettings-tool.c:548
+#: ../gio/gsettings-tool.c:556
 msgid ""
 "List keys and values, recursively\n"
 "If no SCHEMA is given, list all keys\n"
@@ -2472,44 +3179,49 @@ msgstr ""
 "递归列出键和值\n"
 "如果没有给出 SCHEMA,列出所有键\n"
 
-#: ../gio/gsettings-tool.c:550
+#: ../gio/gsettings-tool.c:558
 msgid "[SCHEMA[:PATH]]"
 msgstr "SCHEMA[:PATH]"
 
-#: ../gio/gsettings-tool.c:555
+#: ../gio/gsettings-tool.c:563
 msgid "Get the value of KEY"
 msgstr "获取 KEY 的值"
 
-#: ../gio/gsettings-tool.c:556 ../gio/gsettings-tool.c:562
-#: ../gio/gsettings-tool.c:574 ../gio/gsettings-tool.c:586
+#: ../gio/gsettings-tool.c:564 ../gio/gsettings-tool.c:570
+#: ../gio/gsettings-tool.c:576 ../gio/gsettings-tool.c:588
+#: ../gio/gsettings-tool.c:600
 msgid "SCHEMA[:PATH] KEY"
 msgstr "SCHEMA[:PATH] KEY"
 
-#: ../gio/gsettings-tool.c:561
+#: ../gio/gsettings-tool.c:569
 msgid "Query the range of valid values for KEY"
 msgstr "查询 KEY 的有效值范围"
 
-#: ../gio/gsettings-tool.c:567
+#: ../gio/gsettings-tool.c:575
+msgid "Query the description for KEY"
+msgstr "查询 KEY 的描述"
+
+#: ../gio/gsettings-tool.c:581
 msgid "Set the value of KEY to VALUE"
 msgstr "将 KEY 的值设为 VALUE"
 
-#: ../gio/gsettings-tool.c:568
+#: ../gio/gsettings-tool.c:582
 msgid "SCHEMA[:PATH] KEY VALUE"
 msgstr "SCHEMA[:PATH] KEY VALUE"
 
-#: ../gio/gsettings-tool.c:573
+#: ../gio/gsettings-tool.c:587
 msgid "Reset KEY to its default value"
 msgstr "将 KEY 重设为默认值"
 
-#: ../gio/gsettings-tool.c:579
+#: ../gio/gsettings-tool.c:593
 msgid "Reset all keys in SCHEMA to their defaults"
 msgstr "重置 SCHEMA 中所有键为默认值"
 
-#: ../gio/gsettings-tool.c:585
+#: ../gio/gsettings-tool.c:599
 msgid "Check if KEY is writable"
 msgstr "查看 KEY 是否可写"
 
-#: ../gio/gsettings-tool.c:591
+#: ../gio/gsettings-tool.c:605
 msgid ""
 "Monitor KEY for changes.\n"
 "If no KEY is specified, monitor all keys in SCHEMA.\n"
@@ -2519,11 +3231,11 @@ msgstr ""
 "如果没有指定 KEY,则监视 SCHEMA 中的所有键。\n"
 "使用 ^C 停止监视。\n"
 
-#: ../gio/gsettings-tool.c:594
+#: ../gio/gsettings-tool.c:608
 msgid "SCHEMA[:PATH] [KEY]"
 msgstr "SCHEMA[:PATH] [KEY]"
 
-#: ../gio/gsettings-tool.c:606
+#: ../gio/gsettings-tool.c:620
 msgid ""
 "Usage:\n"
 "  gsettings --version\n"
@@ -2537,6 +3249,7 @@ msgid ""
 "  list-children             List children of a schema\n"
 "  list-recursively          List keys and values, recursively\n"
 "  range                     Queries the range of a key\n"
+"  describe                  Queries the description of a key\n"
 "  get                       Get the value of a key\n"
 "  set                       Set the value of a key\n"
 "  reset                     Reset the value of a key\n"
@@ -2559,6 +3272,7 @@ msgstr ""
 "  list-children             列出某个方案的子对象\n"
 "  list-recursively          递归地列出键和值\n"
 "  range                     查询某个键的范围\n"
+"  describe                  查询某个键的描述\n"
 "  get                       获取某个键值\n"
 "  set                       设置某个键值\n"
 "  reset                     重设某个键值\n"
@@ -2569,7 +3283,7 @@ msgstr ""
 "使用 'gsettings help 命令' 查看详细的帮助。\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:629
+#: ../gio/gsettings-tool.c:644
 #, c-format
 msgid ""
 "Usage:\n"
@@ -2584,11 +3298,11 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../gio/gsettings-tool.c:635
+#: ../gio/gsettings-tool.c:650
 msgid "  SCHEMADIR A directory to search for additional schemas\n"
 msgstr "  SCHEMADIR 一个用于搜索附加方案的目录\n"
 
-#: ../gio/gsettings-tool.c:643
+#: ../gio/gsettings-tool.c:658
 msgid ""
 "  SCHEMA    The name of the schema\n"
 "  PATH      The path, for relocatable schemas\n"
@@ -2596,34 +3310,34 @@ msgstr ""
 "  SCHEMA    方案的名称\n"
 "  PATH      可重定向方案的路径\n"
 
-#: ../gio/gsettings-tool.c:648
+#: ../gio/gsettings-tool.c:663
 msgid "  KEY       The (optional) key within the schema\n"
 msgstr "  KEY       方案中(可选)的键\n"
 
-#: ../gio/gsettings-tool.c:652
+#: ../gio/gsettings-tool.c:667
 msgid "  KEY       The key within the schema\n"
 msgstr "  KEY       方案中的键\n"
 
-#: ../gio/gsettings-tool.c:656
+#: ../gio/gsettings-tool.c:671
 msgid "  VALUE     The value to set\n"
 msgstr "  VALUE     要设的值\n"
 
-#: ../gio/gsettings-tool.c:711
+#: ../gio/gsettings-tool.c:726
 #, c-format
 msgid "Could not load schemas from %s: %s\n"
 msgstr "无法从 %s 加载方案:%s\n"
 
-#: ../gio/gsettings-tool.c:723
+#: ../gio/gsettings-tool.c:738
 #, c-format
 msgid "No schemas installed\n"
 msgstr "没有安装方案文件\n"
 
-#: ../gio/gsettings-tool.c:788
+#: ../gio/gsettings-tool.c:809
 #, c-format
 msgid "Empty schema name given\n"
 msgstr "给出了空的大纲名称\n"
 
-#: ../gio/gsettings-tool.c:843
+#: ../gio/gsettings-tool.c:864
 #, c-format
 msgid "No such key '%s'\n"
 msgstr "没有“%s”这个键\n"
@@ -2641,8 +3355,8 @@ msgstr "无效的套接字,初始化失败的原因是:%s"
 msgid "Socket is already closed"
 msgstr "套接字已经关闭"
 
-#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3896
-#: ../gio/gsocket.c:3951
+#: ../gio/gsocket.c:394 ../gio/gsocket.c:2751 ../gio/gsocket.c:3897
+#: ../gio/gsocket.c:3952
 msgid "Socket I/O timed out"
 msgstr "套接字 I/O 超时"
 
@@ -2741,31 +3455,31 @@ msgstr "无法关闭套接字:%s"
 msgid "Error closing socket: %s"
 msgstr "关闭套接字出错:%s"
 
-#: ../gio/gsocket.c:3889
+#: ../gio/gsocket.c:3890
 #, c-format
 msgid "Waiting for socket condition: %s"
 msgstr "等待套接字状态:%s"
 
-#: ../gio/gsocket.c:4361 ../gio/gsocket.c:4441 ../gio/gsocket.c:4619
+#: ../gio/gsocket.c:4362 ../gio/gsocket.c:4442 ../gio/gsocket.c:4620
 #, c-format
 msgid "Error sending message: %s"
 msgstr "发送信息出错:%s"
 
-#: ../gio/gsocket.c:4385
+#: ../gio/gsocket.c:4386
 msgid "GSocketControlMessage not supported on Windows"
 msgstr "Windows 不支持 GSocketControlMessage"
 
-#: ../gio/gsocket.c:4840 ../gio/gsocket.c:4913 ../gio/gsocket.c:5140
+#: ../gio/gsocket.c:4839 ../gio/gsocket.c:4912 ../gio/gsocket.c:5139
 #, c-format
 msgid "Error receiving message: %s"
 msgstr "接受信息出错:%s"
 
-#: ../gio/gsocket.c:5412
+#: ../gio/gsocket.c:5411
 #, c-format
 msgid "Unable to read socket credentials: %s"
 msgstr "无法读取套接字认证信息:%s"
 
-#: ../gio/gsocket.c:5421
+#: ../gio/gsocket.c:5420
 msgid "g_socket_get_credentials not implemented for this OS"
 msgstr "此操作系统上没有实现 g_socket_get_credentials"
 
@@ -2794,7 +3508,7 @@ msgstr "不支持通过非 TCP 连接的代理。"
 #: ../gio/gsocketclient.c:1110 ../gio/gsocketclient.c:1561
 #, c-format
 msgid "Proxy protocol '%s' is not supported."
-msgstr "不支持 %s 代理协议。"
+msgstr "不支持代理协议“%s”。"
 
 #: ../gio/gsocketlistener.c:218
 msgid "Listener is already closed"
@@ -2807,7 +3521,7 @@ msgstr "新增套接字已关闭"
 #: ../gio/gsocks4aproxy.c:118
 #, c-format
 msgid "SOCKSv4 does not support IPv6 address '%s'"
-msgstr "SOCKSv4 不支持 IPv6 地址 %s"
+msgstr "SOCKSv4 不支持 IPv6 地址“%s”"
 
 #: ../gio/gsocks4aproxy.c:136
 msgid "Username is too long for SOCKSv4 protocol"
@@ -2816,7 +3530,7 @@ msgstr "用户名对于 SOCKSv4 协议太长。"
 #: ../gio/gsocks4aproxy.c:153
 #, c-format
 msgid "Hostname '%s' is too long for SOCKSv4 protocol"
-msgstr "主机名 %s 对于 SOCKSv4 协议太长"
+msgstr "主机名“%s”对于 SOCKSv4 协议过长"
 
 #: ../gio/gsocks4aproxy.c:179
 msgid "The server is not a SOCKSv4 proxy server."
@@ -2852,7 +3566,7 @@ msgstr "SOCKSv5 认证失败:用户名或密码错误。"
 #: ../gio/gsocks5proxy.c:286
 #, c-format
 msgid "Hostname '%s' is too long for SOCKSv5 protocol"
-msgstr "主机名 %s 对于 SOCKSv5 协议太长。"
+msgstr "主机名“%s”对于 SOCKSv5 协议过长"
 
 #: ../gio/gsocks5proxy.c:348
 msgid "The SOCKSv5 proxy server uses unknown address type."
@@ -2880,7 +3594,7 @@ msgstr "通过 SOCKSv5 代理连接被拒绝。"
 
 #: ../gio/gsocks5proxy.c:386
 msgid "SOCKSv5 proxy does not support 'connect' command."
-msgstr "SOCKSv5 代理不支持 connect 命令。"
+msgstr "SOCKSv5 代理不支持“connect”命令。"
 
 #: ../gio/gsocks5proxy.c:392
 msgid "SOCKSv5 proxy does not support provided address type."
@@ -2899,26 +3613,26 @@ msgstr "无法处理 GThemedIcon 编码的版本 %d"
 msgid "No valid addresses were found"
 msgstr "找不到合法的地址"
 
-#: ../gio/gthreadedresolver.c:211
+#: ../gio/gthreadedresolver.c:213
 #, c-format
 msgid "Error reverse-resolving '%s': %s"
-msgstr "反向解析“%s”出错:%s"
+msgstr "反向解析“%s”时出错:%s"
 
-#: ../gio/gthreadedresolver.c:546 ../gio/gthreadedresolver.c:626
-#: ../gio/gthreadedresolver.c:724 ../gio/gthreadedresolver.c:774
+#: ../gio/gthreadedresolver.c:550 ../gio/gthreadedresolver.c:630
+#: ../gio/gthreadedresolver.c:728 ../gio/gthreadedresolver.c:778
 #, c-format
 msgid "No DNS record of the requested type for '%s'"
-msgstr "“%s”:没有所请求类型的 DNS 记录"
+msgstr "没有“%s”所请求类型的 DNS 记录"
 
-#: ../gio/gthreadedresolver.c:551 ../gio/gthreadedresolver.c:729
+#: ../gio/gthreadedresolver.c:555 ../gio/gthreadedresolver.c:733
 #, c-format
 msgid "Temporarily unable to resolve '%s'"
 msgstr "暂时无法解析“%s”"
 
-#: ../gio/gthreadedresolver.c:556 ../gio/gthreadedresolver.c:734
+#: ../gio/gthreadedresolver.c:560 ../gio/gthreadedresolver.c:738
 #, c-format
 msgid "Error resolving '%s'"
-msgstr "解析“%s”出错"
+msgstr "解析“%s”时出错"
 
 #: ../gio/gtlscertificate.c:250
 msgid "Cannot decrypt PEM-encoded private key"
@@ -3016,7 +3730,7 @@ msgstr "从文件描述符读取出错:%s"
 msgid "Error closing file descriptor: %s"
 msgstr "关闭文件描述符出错:%s"
 
-#: ../gio/gunixmounts.c:2099 ../gio/gunixmounts.c:2152
+#: ../gio/gunixmounts.c:2329 ../gio/gunixmounts.c:2382
 msgid "Filesystem root"
 msgstr "文件系统根目录"
 
@@ -3038,7 +3752,7 @@ msgstr "卷未实现弹出"
 #. * don't implement any of eject or eject_with_operation.
 #: ../gio/gvolume.c:514
 msgid "volume doesn't implement eject or eject_with_operation"
-msgstr "卷未执行 eject 或  eject_with_operation"
+msgstr "卷未实现弹出或  eject_with_operation"
 
 #: ../gio/gwin32inputstream.c:185
 #, c-format
@@ -3120,55 +3834,55 @@ msgstr "意外标签“%s”,需要标签“%s”"
 msgid "Unexpected tag '%s' inside '%s'"
 msgstr "“%2$s”中的意外标签“%1$s”"
 
-#: ../glib/gbookmarkfile.c:1756
+#: ../glib/gbookmarkfile.c:1757
 msgid "No valid bookmark file found in data dirs"
 msgstr "数据目录中没有找到有效的书签文件"
 
-#: ../glib/gbookmarkfile.c:1957
+#: ../glib/gbookmarkfile.c:1958
 #, c-format
 msgid "A bookmark for URI '%s' already exists"
 msgstr "URI“%s”的书签已经存在"
 
-#: ../glib/gbookmarkfile.c:2003 ../glib/gbookmarkfile.c:2161
-#: ../glib/gbookmarkfile.c:2246 ../glib/gbookmarkfile.c:2326
-#: ../glib/gbookmarkfile.c:2411 ../glib/gbookmarkfile.c:2494
-#: ../glib/gbookmarkfile.c:2572 ../glib/gbookmarkfile.c:2651
-#: ../glib/gbookmarkfile.c:2693 ../glib/gbookmarkfile.c:2790
-#: ../glib/gbookmarkfile.c:2910 ../glib/gbookmarkfile.c:3100
-#: ../glib/gbookmarkfile.c:3176 ../glib/gbookmarkfile.c:3344
-#: ../glib/gbookmarkfile.c:3433 ../glib/gbookmarkfile.c:3522
-#: ../glib/gbookmarkfile.c:3638
+#: ../glib/gbookmarkfile.c:2004 ../glib/gbookmarkfile.c:2162
+#: ../glib/gbookmarkfile.c:2247 ../glib/gbookmarkfile.c:2327
+#: ../glib/gbookmarkfile.c:2412 ../glib/gbookmarkfile.c:2495
+#: ../glib/gbookmarkfile.c:2573 ../glib/gbookmarkfile.c:2652
+#: ../glib/gbookmarkfile.c:2694 ../glib/gbookmarkfile.c:2791
+#: ../glib/gbookmarkfile.c:2911 ../glib/gbookmarkfile.c:3101
+#: ../glib/gbookmarkfile.c:3177 ../glib/gbookmarkfile.c:3345
+#: ../glib/gbookmarkfile.c:3434 ../glib/gbookmarkfile.c:3523
+#: ../glib/gbookmarkfile.c:3639
 #, c-format
 msgid "No bookmark found for URI '%s'"
 msgstr "未找到 URI“%s”的书签"
 
-#: ../glib/gbookmarkfile.c:2335
+#: ../glib/gbookmarkfile.c:2336
 #, c-format
 msgid "No MIME type defined in the bookmark for URI '%s'"
 msgstr "URI“%s”的书签未定义 MIME 类型"
 
-#: ../glib/gbookmarkfile.c:2420
+#: ../glib/gbookmarkfile.c:2421
 #, c-format
 msgid "No private flag has been defined in bookmark for URI '%s'"
 msgstr "URI“%s”的书签未定义私有标志"
 
-#: ../glib/gbookmarkfile.c:2799
+#: ../glib/gbookmarkfile.c:2800
 #, c-format
 msgid "No groups set in bookmark for URI '%s'"
 msgstr "URI“%s”的书签未设定组"
 
-#: ../glib/gbookmarkfile.c:3197 ../glib/gbookmarkfile.c:3354
+#: ../glib/gbookmarkfile.c:3198 ../glib/gbookmarkfile.c:3355
 #, c-format
 msgid "No application with name '%s' registered a bookmark for '%s'"
 msgstr "没有名为“%s”的应用程序为“%s”注册书签"
 
-#: ../glib/gbookmarkfile.c:3377
+#: ../glib/gbookmarkfile.c:3378
 #, c-format
 msgid "Failed to expand exec line '%s' with URI '%s'"
 msgstr "用 URI“%2$s”展开 exec 行“%1$s”失败"
 
-#: ../glib/gconvert.c:477 ../glib/gutf8.c:849 ../glib/gutf8.c:1061
-#: ../glib/gutf8.c:1198 ../glib/gutf8.c:1302
+#: ../glib/gconvert.c:477 ../glib/gutf8.c:851 ../glib/gutf8.c:1063
+#: ../glib/gutf8.c:1200 ../glib/gutf8.c:1304
 msgid "Partial character sequence at end of input"
 msgstr "输入末尾出现未尽字符序列"
 
@@ -3180,7 +3894,7 @@ msgstr "无法转换后备字符集“%s”到字符集“%s”"
 #: ../glib/gconvert.c:1567
 #, c-format
 msgid "The URI '%s' is not an absolute URI using the \"file\" scheme"
-msgstr "URI“%s”不是“file”格式的绝对 URI"
+msgstr "URI“%s”不是使用“file”方案的绝对 URI"
 
 #: ../glib/gconvert.c:1577
 #, c-format
@@ -3195,7 +3909,7 @@ msgstr "URI“%s”无效"
 #: ../glib/gconvert.c:1606
 #, c-format
 msgid "The hostname of the URI '%s' is invalid"
-msgstr "URI中的主机名“%s”无效"
+msgstr "URI“%s”中的主机名无效"
 
 #: ../glib/gconvert.c:1622
 #, c-format
@@ -3442,86 +4156,82 @@ msgstr "日"
 msgid "Error opening directory '%s': %s"
 msgstr "打开目录“%s”时发生错误:%s"
 
-#: ../glib/gfileutils.c:700 ../glib/gfileutils.c:792
+#: ../glib/gfileutils.c:701 ../glib/gfileutils.c:793
 #, c-format
 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:717
+#: ../glib/gfileutils.c:718
 #, c-format
 msgid "Error reading file '%s': %s"
 msgstr "读取文件“%s”出错:%s"
 
-#: ../glib/gfileutils.c:753
+#: ../glib/gfileutils.c:754
 #, c-format
 msgid "File \"%s\" is too large"
-msgstr "文件“%s”太大"
+msgstr "文件“%s”过大"
 
-#: ../glib/gfileutils.c:817
+#: ../glib/gfileutils.c:818
 #, c-format
 msgid "Failed to read from file '%s': %s"
 msgstr "读取文件“%s”失败:%s"
 
-#: ../glib/gfileutils.c:865 ../glib/gfileutils.c:937
+#: ../glib/gfileutils.c:866 ../glib/gfileutils.c:938
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "打开文件“%s”失败:%s"
 
-#: ../glib/gfileutils.c:877
+#: ../glib/gfileutils.c:878
 #, c-format
 msgid "Failed to get attributes of file '%s': fstat() failed: %s"
 msgstr "获得文件“%s”的属性失败:fstat() 失败:%s"
 
-#: ../glib/gfileutils.c:907
+#: ../glib/gfileutils.c:908
 #, c-format
 msgid "Failed to open file '%s': fdopen() failed: %s"
 msgstr "打开文件“%s”失败:fdopen() 失败:%s"
 
-#: ../glib/gfileutils.c:1006
+#: ../glib/gfileutils.c:1007
 #, c-format
 msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
 msgstr "将文件“%s”重命名为“%s”失败:g_rename() 失败:%s"
 
-#: ../glib/gfileutils.c:1041 ../glib/gfileutils.c:1540
+#: ../glib/gfileutils.c:1042 ../glib/gfileutils.c:1541
 #, c-format
 msgid "Failed to create file '%s': %s"
 msgstr "创建文件“%s”失败:%s"
 
-#: ../glib/gfileutils.c:1068
+#: ../glib/gfileutils.c:1069
 #, c-format
 msgid "Failed to write file '%s': write() failed: %s"
 msgstr "写入文件“%s”失败:write() 失败:%s"
 
-#: ../glib/gfileutils.c:1111
+#: ../glib/gfileutils.c:1112
 #, c-format
 msgid "Failed to write file '%s': fsync() failed: %s"
 msgstr "写入文件“%s”失败:fsync() 失败:%s"
 
-#: ../glib/gfileutils.c:1235
+#: ../glib/gfileutils.c:1236
 #, c-format
 msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
 msgstr "无法删除已有文件“%s”:g_unlink() 失败:%s"
 
-#: ../glib/gfileutils.c:1506
+#: ../glib/gfileutils.c:1507
 #, c-format
 msgid "Template '%s' invalid, should not contain a '%s'"
 msgstr "模板“%s”无效,不应该包含“%s”"
 
-#: ../glib/gfileutils.c:1519
+#: ../glib/gfileutils.c:1520
 #, c-format
 msgid "Template '%s' doesn't contain XXXXXX"
 msgstr "模板“%s”不包含 XXXXXX"
 
-#: ../glib/gfileutils.c:2038
+#: ../glib/gfileutils.c:2045
 #, c-format
 msgid "Failed to read the symbolic link '%s': %s"
 msgstr "读取符号链接“%s”失败:%s"
 
-#: ../glib/gfileutils.c:2057
-msgid "Symbolic links not supported"
-msgstr "不支持符号链接"
-
 #: ../glib/giochannel.c:1388
 #, c-format
 msgid "Could not open converter from '%s' to '%s': %s"
@@ -3552,91 +4262,91 @@ msgstr "在搜索目录中无法找到有效的键文件"
 msgid "Not a regular file"
 msgstr "不是普通文件"
 
-#: ../glib/gkeyfile.c:1174
+#: ../glib/gkeyfile.c:1204
 #, c-format
 msgid ""
 "Key file contains line '%s' which is not a key-value pair, group, or comment"
-msgstr "键文件中的行“%s”不是键-值对、组或注释"
+msgstr "键文件包含不是键-值对、组或注释的行“%s”"
 
-#: ../glib/gkeyfile.c:1231
+#: ../glib/gkeyfile.c:1261
 #, c-format
 msgid "Invalid group name: %s"
 msgstr "无效的组名:%s"
 
-#: ../glib/gkeyfile.c:1253
+#: ../glib/gkeyfile.c:1283
 msgid "Key file does not start with a group"
 msgstr "键文件不以组开始"
 
-#: ../glib/gkeyfile.c:1279
+#: ../glib/gkeyfile.c:1309
 #, c-format
 msgid "Invalid key name: %s"
 msgstr "无效的键名:%s"
 
-#: ../glib/gkeyfile.c:1306
+#: ../glib/gkeyfile.c:1336
 #, c-format
 msgid "Key file contains unsupported encoding '%s'"
 msgstr "键文件包含不支持的编码“%s”"
 
-#: ../glib/gkeyfile.c:1549 ../glib/gkeyfile.c:1722 ../glib/gkeyfile.c:3100
-#: ../glib/gkeyfile.c:3163 ../glib/gkeyfile.c:3293 ../glib/gkeyfile.c:3423
-#: ../glib/gkeyfile.c:3567 ../glib/gkeyfile.c:3796 ../glib/gkeyfile.c:3863
+#: ../glib/gkeyfile.c:1579 ../glib/gkeyfile.c:1752 ../glib/gkeyfile.c:3130
+#: ../glib/gkeyfile.c:3193 ../glib/gkeyfile.c:3323 ../glib/gkeyfile.c:3453
+#: ../glib/gkeyfile.c:3597 ../glib/gkeyfile.c:3826 ../glib/gkeyfile.c:3893
 #, c-format
 msgid "Key file does not have group '%s'"
 msgstr "键文件没有组“%s”"
 
-#: ../glib/gkeyfile.c:1677
+#: ../glib/gkeyfile.c:1707
 #, c-format
 msgid "Key file does not have key '%s' in group '%s'"
-msgstr "键文件的组“%2$s”中不包含键“%1$s”"
+msgstr "键文件在组“%2$s”中没有键“%1$s”"
 
-#: ../glib/gkeyfile.c:1839 ../glib/gkeyfile.c:1955
+#: ../glib/gkeyfile.c:1869 ../glib/gkeyfile.c:1985
 #, c-format
 msgid "Key file contains key '%s' with value '%s' which is not UTF-8"
-msgstr "键文件包含“%s”,其值“%s”不是 UTF-8"
+msgstr "键文件包含键“%s”,其值“%s”不是 UTF-8"
 
-#: ../glib/gkeyfile.c:1859 ../glib/gkeyfile.c:1975 ../glib/gkeyfile.c:2344
+#: ../glib/gkeyfile.c:1889 ../glib/gkeyfile.c:2005 ../glib/gkeyfile.c:2374
 #, c-format
 msgid ""
 "Key file contains key '%s' which has a value that cannot be interpreted."
 msgstr "键文件包含键“%s”,其值无法解释。"
 
-#: ../glib/gkeyfile.c:2561 ../glib/gkeyfile.c:2929
+#: ../glib/gkeyfile.c:2591 ../glib/gkeyfile.c:2959
 #, c-format
 msgid ""
 "Key file contains key '%s' in group '%s' which has a value that cannot be "
 "interpreted."
-msgstr "键文件中组“%2$s”的键“%1$s”有一个无法解释的值。"
+msgstr "键文件包含组“%2$s”中的键“%1$s”,其值无法解释。"
 
-#: ../glib/gkeyfile.c:2639 ../glib/gkeyfile.c:2716
+#: ../glib/gkeyfile.c:2669 ../glib/gkeyfile.c:2746
 #, c-format
 msgid "Key '%s' in group '%s' has value '%s' where %s was expected"
-msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”,应为 %4$s。"
+msgstr "组“%2$s”中的键“%1$s”的值为“%3$s”,应为 %4$s"
 
-#: ../glib/gkeyfile.c:4103
+#: ../glib/gkeyfile.c:4133
 msgid "Key file contains escape character at end of line"
 msgstr "键文件在行尾含有转义字符"
 
-#: ../glib/gkeyfile.c:4125
+#: ../glib/gkeyfile.c:4155
 #, c-format
 msgid "Key file contains invalid escape sequence '%s'"
 msgstr "键文件中包含无效的转义序列“%s”"
 
-#: ../glib/gkeyfile.c:4267
+#: ../glib/gkeyfile.c:4297
 #, c-format
 msgid "Value '%s' cannot be interpreted as a number."
 msgstr "无法将值“%s”解释为数值。"
 
-#: ../glib/gkeyfile.c:4281
+#: ../glib/gkeyfile.c:4311
 #, c-format
 msgid "Integer value '%s' out of range"
 msgstr "整数值“%s”超出范围"
 
-#: ../glib/gkeyfile.c:4314
+#: ../glib/gkeyfile.c:4344
 #, c-format
 msgid "Value '%s' cannot be interpreted as a float number."
 msgstr "无法将值“%s”解释为浮点数。"
 
-#: ../glib/gkeyfile.c:4351
+#: ../glib/gkeyfile.c:4383
 #, c-format
 msgid "Value '%s' cannot be interpreted as a boolean."
 msgstr "无法将值“%s”解释为布尔值。"
@@ -3651,7 +4361,7 @@ msgstr "获取文件“%s%s%s%s”的属性失败 : fstat() 失败:%s"
 msgid "Failed to map %s%s%s%s: mmap() failed: %s"
 msgstr "映射 %s%s%s%s 失败:mmap() 失败:%s"
 
-#: ../glib/gmappedfile.c:261
+#: ../glib/gmappedfile.c:262
 #, c-format
 msgid "Failed to open file '%s': open() failed: %s"
 msgstr "打开文件“%s”失败:open() 失败:%s"
@@ -3839,13 +4549,9 @@ msgstr "文档在元素“%s”结束标记中意外结束"
 msgid "Document ended unexpectedly inside a comment or processing instruction"
 msgstr "文档在注释或处理指令中意外结束"
 
-#: ../glib/goption.c:857
-msgid "Usage:"
-msgstr "用法:"
-
 #: ../glib/goption.c:861
 msgid "[OPTION...]"
-msgstr "[选项...]"
+msgstr "[选项…]"
 
 #: ../glib/goption.c:977
 msgid "Help Options:"
@@ -3870,7 +4576,7 @@ msgstr "选项:"
 #: ../glib/goption.c:1113 ../glib/goption.c:1183
 #, c-format
 msgid "Cannot parse integer value '%s' for %s"
-msgstr "无法处理 %2$s 所用的整数值“%1$s”"
+msgstr "无法解析 %2$s 的整数值“%1$s”"
 
 #: ../glib/goption.c:1123 ../glib/goption.c:1191
 #, c-format
@@ -3880,24 +4586,24 @@ msgstr "%2$s 所用的整数值“%1$s”超出范围"
 #: ../glib/goption.c:1148
 #, c-format
 msgid "Cannot parse double value '%s' for %s"
-msgstr "无法处理 %2$s 所用的双精度值“%1$s”"
+msgstr "无法解析 %2$s 的双精度值“%1$s”"
 
 #: ../glib/goption.c:1156
 #, c-format
 msgid "Double value '%s' for %s out of range"
-msgstr "%2$s 所用的双精度值“%1$s”超出范围"
+msgstr "“%2$s”所用的双精度值“%1$s”超出范围"
 
-#: ../glib/goption.c:1442 ../glib/goption.c:1521
+#: ../glib/goption.c:1448 ../glib/goption.c:1527
 #, c-format
 msgid "Error parsing option %s"
 msgstr "解析选项 %s 时出错"
 
-#: ../glib/goption.c:1552 ../glib/goption.c:1665
+#: ../glib/goption.c:1558 ../glib/goption.c:1671
 #, c-format
 msgid "Missing argument for %s"
 msgstr "缺少 %s 的参数"
 
-#: ../glib/goption.c:2126
+#: ../glib/goption.c:2132
 #, c-format
 msgid "Unknown option %s"
 msgstr "未知选项 %s"
@@ -3922,6 +4628,10 @@ msgstr "达到回溯上限"
 msgid "the pattern contains items not supported for partial matching"
 msgstr "表达式包含不被部分匹配支持的项"
 
+#: ../glib/gregex.c:281
+msgid "internal error"
+msgstr "内部错误"
+
 #: ../glib/gregex.c:289
 msgid "back references as conditions are not supported for partial matching"
 msgstr "不完全匹配时作为条件的后向引用不被支持."
@@ -4195,7 +4905,7 @@ msgstr "在 (*MARK), (*PRUNE), (*SKIP) 或者 (*THEN) 中名称太长"
 msgid "character value in \\u.... sequence is too large"
 msgstr "\\u.... 序列里的字符值太大了"
 
-#: ../glib/gregex.c:746 ../glib/gregex.c:1973
+#: ../glib/gregex.c:746 ../glib/gregex.c:1977
 #, c-format
 msgid "Error while matching regular expression %s: %s"
 msgstr "匹配正则表达式 %s 出现错误:%s"
@@ -4222,50 +4932,50 @@ msgstr "优化正则表达式 %s 时出错:%s"
 msgid "Error while compiling regular expression %s at char %d: %s"
 msgstr "编译正则表达式 %s (于字符 %d 处)时出错:%s"
 
-#: ../glib/gregex.c:2409
+#: ../glib/gregex.c:2413
 msgid "hexadecimal digit or '}' expected"
-msgstr "期望十六进制数或 '}'"
+msgstr "期望十六进制数或“}”"
 
-#: ../glib/gregex.c:2425
+#: ../glib/gregex.c:2429
 msgid "hexadecimal digit expected"
 msgstr "期望十六进制数"
 
-#: ../glib/gregex.c:2465
+#: ../glib/gregex.c:2469
 msgid "missing '<' in symbolic reference"
 msgstr "在符号引用中缺少“<”"
 
-#: ../glib/gregex.c:2474
+#: ../glib/gregex.c:2478
 msgid "unfinished symbolic reference"
 msgstr "未完成的符号引用"
 
-#: ../glib/gregex.c:2481
+#: ../glib/gregex.c:2485
 msgid "zero-length symbolic reference"
 msgstr "零长符号引用"
 
-#: ../glib/gregex.c:2492
+#: ../glib/gregex.c:2496
 msgid "digit expected"
 msgstr "期望数字"
 
-#: ../glib/gregex.c:2510
+#: ../glib/gregex.c:2514
 msgid "illegal symbolic reference"
 msgstr "非法的符号引用"
 
-#: ../glib/gregex.c:2572
+#: ../glib/gregex.c:2576
 msgid "stray final '\\'"
 msgstr "丢失了最后的“\\”"
 
-#: ../glib/gregex.c:2576
+#: ../glib/gregex.c:2580
 msgid "unknown escape sequence"
 msgstr "未知的转义序列"
 
-#: ../glib/gregex.c:2586
+#: ../glib/gregex.c:2590
 #, c-format
 msgid "Error while parsing replacement text \"%s\" at char %lu: %s"
-msgstr "分析替换文本\"%s\" 时在字符 %lu 处发生错误:%s"
+msgstr "解析替换文本“%s”时在字符 %lu 处发生错误:%s"
 
 #: ../glib/gshell.c:96
 msgid "Quoted text doesn't begin with a quotation mark"
-msgstr "引用的文本没有以引号开头"
+msgstr "引用的文本不以引号开头"
 
 #: ../glib/gshell.c:186
 msgid "Unmatched quotation mark in command line or other shell-quoted text"
@@ -4279,7 +4989,7 @@ msgstr "文本在一个“\\”字符后结束。(文本为“%s”)"
 #: ../glib/gshell.c:589
 #, c-format
 msgid "Text ended before matching quote was found for %c. (The text was '%s')"
-msgstr "文本在找到与 %c 匹配的引号之前结束。(文本为“%s”)"
+msgstr "在找到为 %c 匹配的引用之前,文本已结束。(文本为“%s”)"
 
 #: ../glib/gshell.c:601
 msgid "Text was empty (or contained only whitespace)"
@@ -4338,7 +5048,7 @@ msgstr "更改到目录“%s”失败(%s)"
 #: ../glib/gspawn.c:1500
 #, c-format
 msgid "Failed to execute child process \"%s\" (%s)"
-msgstr "执行子进程“%s”失败(%s)"
+msgstr "执行子进程“%s\"失败(%s)"
 
 #: ../glib/gspawn.c:1510
 #, c-format
@@ -4407,91 +5117,91 @@ msgid ""
 "process"
 msgstr "g_io_channel_win32_poll() 从子进程中读取数据时出现异常错误"
 
-#: ../glib/gutf8.c:795
+#: ../glib/gutf8.c:797
 msgid "Failed to allocate memory"
 msgstr "分配内存失败"
 
-#: ../glib/gutf8.c:928
+#: ../glib/gutf8.c:930
 msgid "Character out of range for UTF-8"
 msgstr "字符超出 UTF-8 范围"
 
-#: ../glib/gutf8.c:1029 ../glib/gutf8.c:1038 ../glib/gutf8.c:1168
-#: ../glib/gutf8.c:1177 ../glib/gutf8.c:1316 ../glib/gutf8.c:1413
+#: ../glib/gutf8.c:1031 ../glib/gutf8.c:1040 ../glib/gutf8.c:1170
+#: ../glib/gutf8.c:1179 ../glib/gutf8.c:1318 ../glib/gutf8.c:1415
 msgid "Invalid sequence in conversion input"
 msgstr "转换输入中出现无效序列"
 
-#: ../glib/gutf8.c:1327 ../glib/gutf8.c:1424
+#: ../glib/gutf8.c:1329 ../glib/gutf8.c:1426
 msgid "Character out of range for UTF-16"
 msgstr "字符超出 UTF-16 范围"
 
-#: ../glib/gutils.c:2133 ../glib/gutils.c:2160 ../glib/gutils.c:2266
+#: ../glib/gutils.c:2139 ../glib/gutils.c:2166 ../glib/gutils.c:2272
 #, c-format
 msgid "%u byte"
 msgid_plural "%u bytes"
 msgstr[0] "%u 字节"
 
-#: ../glib/gutils.c:2139
+#: ../glib/gutils.c:2145
 #, c-format
 msgid "%.1f KiB"
 msgstr "%.1f KiB"
 
-#: ../glib/gutils.c:2141
+#: ../glib/gutils.c:2147
 #, c-format
 msgid "%.1f MiB"
 msgstr "%.1f MiB"
 
-#: ../glib/gutils.c:2144
+#: ../glib/gutils.c:2150
 #, c-format
 msgid "%.1f GiB"
 msgstr "%.1f GiB"
 
-#: ../glib/gutils.c:2147
+#: ../glib/gutils.c:2153
 #, c-format
 msgid "%.1f TiB"
 msgstr "%.1f TiB"
 
-#: ../glib/gutils.c:2150
+#: ../glib/gutils.c:2156
 #, c-format
 msgid "%.1f PiB"
 msgstr "%.1f PiB"
 
-#: ../glib/gutils.c:2153
+#: ../glib/gutils.c:2159
 #, c-format
 msgid "%.1f EiB"
 msgstr "%.1f EiB"
 
-#: ../glib/gutils.c:2166
+#: ../glib/gutils.c:2172
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f KB"
 
-#: ../glib/gutils.c:2169 ../glib/gutils.c:2284
+#: ../glib/gutils.c:2175 ../glib/gutils.c:2290
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../glib/gutils.c:2172 ../glib/gutils.c:2289
+#: ../glib/gutils.c:2178 ../glib/gutils.c:2295
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../glib/gutils.c:2174 ../glib/gutils.c:2294
+#: ../glib/gutils.c:2180 ../glib/gutils.c:2300
 #, c-format
 msgid "%.1f TB"
 msgstr "%.1f TB"
 
-#: ../glib/gutils.c:2177 ../glib/gutils.c:2299
+#: ../glib/gutils.c:2183 ../glib/gutils.c:2305
 #, c-format
 msgid "%.1f PB"
 msgstr "%.1f PB"
 
-#: ../glib/gutils.c:2180 ../glib/gutils.c:2304
+#: ../glib/gutils.c:2186 ../glib/gutils.c:2310
 #, c-format
 msgid "%.1f EB"
 msgstr "%.1f EB"
 
 #. Translators: the %s in "%s bytes" will always be replaced by a number.
-#: ../glib/gutils.c:2217
+#: ../glib/gutils.c:2223
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
@@ -4502,19 +5212,76 @@ msgstr[0] "%s 字节"
 #. * compatibility.  Users will not see this string unless a program is using this deprecated function.
 #. * Please translate as literally as possible.
 #.
-#: ../glib/gutils.c:2279
+#: ../glib/gutils.c:2285
 #, c-format
 msgid "%.1f KB"
 msgstr "%.1f KB"
 
-#~ msgid "Unable to find default local directory monitor type"
-#~ msgstr "无法找到默认的本地目录监视器类型"
+#, fuzzy
+#~| msgid "[ARGS...]"
+#~ msgid "[ARGS…]"
+#~ msgstr "[ARGS...]"
+
+#, fuzzy
+#~| msgid ""
+#~| "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~| "variable - unknown value '%s'"
+#~ msgid ""
+#~ "Cannot determine bus address from DBUS_STARTER_BUS_TYPE environment "
+#~ "variable — unknown value “%s”"
+#~ msgstr "无法从 DBUS_STARTER_BUS_TYPE 环境变量确定总线地址 - 未知的值“%s”"
+
+#, fuzzy
+#~| msgid "Error creating directory '%s': %s"
+#~ msgid "Error creating directory “%s”: %s"
+#~ msgstr "创建目录“%s”出错:%s"
+
+#, fuzzy
+#~| msgid "Error opening file '%s': %s"
+#~ msgid "Error opening file “%s”: %s"
+#~ msgstr "打开文件“%s”出错:%s"
+
+#, fuzzy
+#~| msgid "mount doesn't implement \"eject\" or \"eject_with_operation\""
+#~ msgid "mount doesn’t implement “eject” or “eject_with_operation”"
+#~ msgstr "挂载未执行“eject”或“eject_with_operation”"
+
+#, fuzzy
+#~| msgid "Error reading file %s: %s"
+#~ msgid "Error reading file “%s”: %s"
+#~ msgstr "读取文件 %s 出错:%s"
+
+#, fuzzy
+#~| msgid "Failed to write file '%s': fsync() failed: %s"
+#~ msgid "Failed to write file “%s”: fsync() failed: %s"
+#~ msgstr "写入文件“%s”失败:fsync() 失败:%s"
+
+#, fuzzy
+#~| msgid ""
+#~| "Key file contains key '%s' which has a value that cannot be interpreted."
+#~ msgid ""
+#~ "Key file contains key “%s” which has a value that cannot be interpreted."
+#~ msgstr "键文件包含键“%s”,其值无法解释。"
+
+#, fuzzy
+#~| msgid "Failed to execute child process \"%s\" (%s)"
+#~ msgid "Failed to execute child process “%s” (%s)"
+#~ msgstr "执行子进程“%s”失败(%s)"
+
+#~ msgid "Error renaming file: %s"
+#~ msgstr "重命名文件时出错:%s"
+
+#~ msgid "Can't open directory"
+#~ msgstr "无法打开目录"
 
-#~ msgid "Can't find application"
-#~ msgstr "无法找到应用程序"
+#~ msgid "Error opening file: %s"
+#~ msgstr "打开文件时出错:%s"
 
-#~ msgid "Error launching application: %s"
-#~ msgstr "启动应用程序出错:%s"
+#~ msgid "Error creating directory: %s"
+#~ msgstr "创建目录时出错:%s"
+
+#~ msgid "Unable to find default local directory monitor type"
+#~ msgstr "无法找到默认的本地目录监视器类型"
 
 #~ msgid "URIs not supported"
 #~ msgstr "不支持 URI"
@@ -4548,9 +5315,6 @@ msgstr "%.1f KB"
 #~ msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
 #~ msgstr "打开文件“%s”写入失败:fdopen() 失败:%s"
 
-#~ msgid "Failed to write file '%s': fflush() failed: %s"
-#~ msgstr "写入文件“%s”失败:fflush() 失败:%s"
-
 #~ msgid "Failed to close file '%s': fclose() failed: %s"
 #~ msgstr "关闭文件“%s”失败:fclose() 失败:%s"
 
@@ -4581,10 +5345,6 @@ msgstr "%.1f KB"
 #~ msgid "File is empty"
 #~ msgstr "文件为空"
 
-#~ msgid ""
-#~ "Key file contains key '%s' which has value that cannot be interpreted."
-#~ msgstr "键文件包含键“%s”,其值无法解释。"
-
 #~ msgid "This option will be removed soon."
 #~ msgstr "此选项将在不久删除。"
 
@@ -4606,9 +5366,6 @@ msgstr "%.1f KB"
 #~ msgid "Error reading from unix: %s"
 #~ msgstr "读取 unix 出错:%s"
 
-#~ msgid "Error closing unix: %s"
-#~ msgstr "关闭 unix 出错:%s"
-
 #~ msgid "Error writing to unix: %s"
 #~ msgstr "写入 unix 出错:%s"
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]