[gvfs] update zh_CN translation



commit bf725b6285212c9f9eda6446d31f259b6a98d972
Author: Tong Hui <tonghuix gmail com>
Date:   Sun Sep 21 10:21:00 2014 +0800

    update zh_CN translation

 po/zh_CN.po | 1036 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 545 insertions(+), 491 deletions(-)
---
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 740980d..cf8d676 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -9,15 +9,16 @@
 # YunQiang Su <wzssyqa gmail com>, 2011, 2012.
 # tuhaihe <1132321739qq gmail com>, 2012.
 # Wylmer Wang <wantinghard gmail com>, 2014.
+# Tong Hui <tonghuix gmail com>, 2014.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2014-03-08 10:18+0000\n"
-"PO-Revision-Date: 2014-03-08 20:22+0800\n"
-"Last-Translator: Wylmer Wang <wantinghard gmail com>\n"
+"POT-Creation-Date: 2014-09-05 06:45+0000\n"
+"PO-Revision-Date: 2014-08-26 04:12+0800\n"
+"Last-Translator: Tong Hui <tonghuix gmail com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh googlegroups com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +26,11 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2828
+#: ../client/gdaemonfile.c:468 ../client/gdaemonfile.c:2830
 msgid "Operation not supported, files on different mounts"
 msgstr "文件在不同挂载点下,不支持此操作"
 
-#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3177
+#: ../client/gdaemonfile.c:1090 ../client/gdaemonfile.c:3179
 #: ../client/gvfsiconloadable.c:301 ../daemon/gvfsjobopenforread.c:183
 #: ../daemon/gvfsjobopenforwrite.c:326
 msgid "Couldn't get stream file descriptor"
@@ -56,13 +57,13 @@ msgstr "找不到所属挂载点"
 msgid "Invalid filename %s"
 msgstr "无效文件名 %s"
 
-#: ../client/gdaemonfile.c:2670 ../client/gdaemonvfs.c:1254
-#: ../client/gdaemonvfs.c:1306
+#: ../client/gdaemonfile.c:2672 ../client/gdaemonvfs.c:1264
+#: ../client/gdaemonvfs.c:1316
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "设置文件元数据出错:%s"
 
-#: ../client/gdaemonfile.c:2671 ../client/gdaemonvfs.c:1307
+#: ../client/gdaemonfile.c:2673 ../client/gdaemonvfs.c:1317
 msgid "values must be string or list of strings"
 msgstr "值必须是字符串或字符串列表"
 
@@ -87,7 +88,7 @@ msgstr "值必须是字符串或字符串列表"
 #: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1266
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:332
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1072
 #: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635
 #: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923
 #: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086
@@ -111,8 +112,8 @@ msgstr "流协议出错:%s"
 #: ../client/gdaemonfileinputstream.c:545
 #: ../client/gdaemonfileinputstream.c:1715
 #: ../client/gdaemonfileoutputstream.c:496
-#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:1874
-#: ../daemon/gvfsbackendmtp.c:2258
+#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2144
+#: ../daemon/gvfsbackendmtp.c:2528
 msgid "End of stream"
 msgstr "流终止"
 
@@ -122,11 +123,10 @@ msgid "Seek not supported on stream"
 msgstr "流不支持搜索"
 
 #: ../client/gdaemonfileoutputstream.c:1197
-#| msgid "Seek not supported on stream"
 msgid "Truncate not supported on stream"
 msgstr "流不支持截短"
 
-#: ../client/gdaemonvfs.c:778
+#: ../client/gdaemonvfs.c:788
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "获取挂载信息时出错:%s"
@@ -202,9 +202,9 @@ msgstr "GVfsIcon 的输入数据格式错误"
 msgid "%s File System Service"
 msgstr "%s 文件系统服务"
 
-#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:90
-#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
-#: ../programs/gvfs-set-attribute.c:105
+#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:104
+#: ../programs/gvfs-move.c:100 ../programs/gvfs-rename.c:44
+#: ../programs/gvfs-set-attribute.c:107
 #, c-format
 msgid "Error: %s"
 msgstr "错误:%s"
@@ -233,22 +233,27 @@ msgstr "%s 的挂载点已在运行"
 msgid "error starting mount daemon"
 msgstr "启动挂载守护进程失败"
 
-#: ../daemon/gvfsafpconnection.c:764
+#: ../daemon/gvfsafpconnection.c:766
 msgid "The connection is not opened"
 msgstr "连接未打开"
 
-#: ../daemon/gvfsafpconnection.c:771 ../daemon/gvfsbackendmtp.c:327
+#: ../daemon/gvfsafpconnection.c:773 ../daemon/gvfsbackendmtp.c:378
 msgid "The connection is closed"
 msgstr "连接已关闭"
 
-#: ../daemon/gvfsafpconnection.c:1545
-msgid "Connection unexpectedly went down"
-msgstr "连接异常中断"
-
-#: ../daemon/gvfsafpconnection.c:1572
+#: ../daemon/gvfsafpconnection.c:886 ../daemon/gvfsafpconnection.c:1592
 msgid "Got EOS"
 msgstr "收到 EOS"
 
+#: ../daemon/gvfsafpconnection.c:1061 ../daemon/gvfsafpconnection.c:1102
+#: ../daemon/gvfsftptask.c:371
+msgid "Host closed connection"
+msgstr "主机已关闭连接"
+
+#: ../daemon/gvfsafpconnection.c:1565
+msgid "Connection unexpectedly went down"
+msgstr "连接异常中断"
+
 #: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
 msgid "The server doesn't support passwords longer than %d character."
@@ -265,8 +270,8 @@ msgid "Unable to login to the server “%s” with the given password."
 msgstr "无法使用给出的密码登陆到服务器“%s”。"
 
 #: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650
-#: ../daemon/gvfsafpserver.c:825 ../daemon/gvfsafpserver.c:873
-#: ../daemon/gvfsafpserver.c:989 ../daemon/gvfsafpserver.c:1672
+#: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874
+#: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674
 #, c-format
 msgid "Unable to connect to the server “%s”. A communication problem occurred."
 msgstr "无法连接到服务器“%s”。发生了通信问题。"
@@ -288,58 +293,58 @@ msgid ""
 "was found."
 msgstr "无法连接到服务器“%s”。未发现适当的认证机制。"
 
-#: ../daemon/gvfsafpserver.c:803
+#: ../daemon/gvfsafpserver.c:804
 #, c-format
 msgid ""
 "Unable to connect to the server “%s”. The server doesn't support AFP version "
 "3.0 or later."
 msgstr "无法连接到服务器“%s”。服务器不支持 AFP 3.0 版本或更新版本。"
 
-#: ../daemon/gvfsafpserver.c:914
+#: ../daemon/gvfsafpserver.c:915
 #, c-format
 msgid "Permission denied."
 msgstr "拒绝访问。"
 
-#: ../daemon/gvfsafpserver.c:919
+#: ../daemon/gvfsafpserver.c:920
 #, c-format
 msgid "The command is not supported by the server."
 msgstr "服务器不支持命令。"
 
-#: ../daemon/gvfsafpserver.c:923
+#: ../daemon/gvfsafpserver.c:924
 #, c-format
 msgid "Your password has expired."
 msgstr "您的密码已过期。"
 
-#: ../daemon/gvfsafpserver.c:927
+#: ../daemon/gvfsafpserver.c:928
 #, c-format
 msgid "Your password needs to be changed."
 msgstr "您的密码需要更换。"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:1070
+#: ../daemon/gvfsafpserver.c:1071
 #, c-format
 msgid "Enter your password for the server “%s”."
 msgstr "输入您在服务器“%s”上的密码。"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:1073
+#: ../daemon/gvfsafpserver.c:1074
 #, c-format
 msgid "Enter your name and password for the server “%s”."
 msgstr "输入您在服务器“%s”上的用户名和密码。"
 
-#: ../daemon/gvfsafpserver.c:1105
+#: ../daemon/gvfsafpserver.c:1106
 msgid "The password prompt was cancelled."
 msgstr "已取消密码提示。"
 
-#: ../daemon/gvfsafpserver.c:1222
+#: ../daemon/gvfsafpserver.c:1224
 msgid "Unable to disconnect from the server."
 msgstr "无法从服务器断开连接。"
 
-#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1763
+#: ../daemon/gvfsafpserver.c:1366 ../daemon/gvfsafpserver.c:1765
 msgid "Unable to connect to the server. A communication problem occurred."
 msgstr "无法连接到服务器。发生了通信问题。"
 
-#: ../daemon/gvfsafpserver.c:1719
+#: ../daemon/gvfsafpserver.c:1721
 msgid "Identification not found."
 msgstr "未找到标识。"
 
@@ -354,281 +359,284 @@ msgid "Got unknown error code %d from server"
 msgstr "收到来自服务器的错误码 %d"
 
 #. Translators: first %s is volumename and second servername
-#: ../daemon/gvfsafpvolume.c:145
+#: ../daemon/gvfsafpvolume.c:154
 #, c-format
 msgid "Couldn't load %s on %s"
 msgstr "无法加载 %2$s 上的 %1$s"
 
-#: ../daemon/gvfsafpvolume.c:393 ../daemon/gvfsafpvolume.c:663
-#: ../daemon/gvfsafpvolume.c:816 ../daemon/gvfsafpvolume.c:1010
-#: ../daemon/gvfsafpvolume.c:1212 ../daemon/gvfsafpvolume.c:1395
-#: ../daemon/gvfsafpvolume.c:1552 ../daemon/gvfsafpvolume.c:1998
-#: ../daemon/gvfsafpvolume.c:2126 ../daemon/gvfsafpvolume.c:2288
-#: ../daemon/gvfsafpvolume.c:2508 ../daemon/gvfsbackendafc.c:286
-#: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1858
-#: ../daemon/gvfsftptask.c:403
+#: ../daemon/gvfsafpvolume.c:402 ../daemon/gvfsafpvolume.c:672
+#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019
+#: ../daemon/gvfsafpvolume.c:1221 ../daemon/gvfsafpvolume.c:1404
+#: ../daemon/gvfsafpvolume.c:1561 ../daemon/gvfsafpvolume.c:2007
+#: ../daemon/gvfsafpvolume.c:2135 ../daemon/gvfsafpvolume.c:2297
+#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafc.c:289
+#: ../daemon/gvfsbackendsftp.c:322 ../daemon/gvfsbackendsftp.c:1867
+#: ../daemon/gvfsftptask.c:411
 msgid "Permission denied"
 msgstr "权限不足"
 
-#: ../daemon/gvfsafpvolume.c:397 ../daemon/gvfsafpvolume.c:1718
-#: ../daemon/gvfsafpvolume.c:2512 ../daemon/gvfsbackendafc.c:977
+#: ../daemon/gvfsafpvolume.c:406 ../daemon/gvfsafpvolume.c:1727
+#: ../daemon/gvfsafpvolume.c:2521 ../daemon/gvfsbackendafc.c:991
 #: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327
-#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:706
-#: ../daemon/gvfsbackendarchive.c:754 ../daemon/gvfsbackendarchive.c:806
-#: ../daemon/gvfsbackendarchive.c:835 ../daemon/gvfsbackendcdda.c:1022
-#: ../daemon/gvfsbackendcomputer.c:638 ../daemon/gvfsbackenddnssd.c:415
-#: ../daemon/gvfsbackendftp.c:1068 ../daemon/gvfsbackendnetwork.c:696
+#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:734
+#: ../daemon/gvfsbackendarchive.c:786 ../daemon/gvfsbackendarchive.c:838
+#: ../daemon/gvfsbackendarchive.c:867 ../daemon/gvfsbackendcdda.c:1022
+#: ../daemon/gvfsbackendcomputer.c:639 ../daemon/gvfsbackenddnssd.c:415
+#: ../daemon/gvfsbackendftp.c:1073 ../daemon/gvfsbackendnetwork.c:696
 #: ../daemon/gvfsbackendsmbbrowse.c:1146 ../daemon/gvfsbackendsmbbrowse.c:1213
 #: ../daemon/gvfsbackendsmbbrowse.c:1400 ../daemon/gvfsbackendsmbbrowse.c:1473
 #, c-format
 msgid "File doesn't exist"
 msgstr "文件不存在"
 
-#: ../daemon/gvfsafpvolume.c:401 ../daemon/gvfsafpvolume.c:2516
-#: ../daemon/gvfsbackendafp.c:278 ../daemon/gvfsbackendafp.c:479
-#: ../daemon/gvfsbackendafp.c:1338 ../daemon/gvfsbackenddav.c:2251
-#: ../daemon/gvfsbackendftp.c:774 ../daemon/gvfsbackendsftp.c:2370
-#: ../daemon/gvfsbackendsftp.c:3111 ../daemon/gvfsbackendsftp.c:3461
-#: ../daemon/gvfsbackendsftp.c:4493 ../daemon/gvfsbackendsftp.c:5375
+#: ../daemon/gvfsafpvolume.c:410 ../daemon/gvfsafpvolume.c:2525
+#: ../daemon/gvfsbackendafp.c:288 ../daemon/gvfsbackendafp.c:491
+#: ../daemon/gvfsbackendafp.c:1350 ../daemon/gvfsbackenddav.c:2240
+#: ../daemon/gvfsbackenddav.c:3065 ../daemon/gvfsbackendftp.c:779
+#: ../daemon/gvfsbackendsftp.c:2379 ../daemon/gvfsbackendsftp.c:3120
+#: ../daemon/gvfsbackendsftp.c:3470 ../daemon/gvfsbackendsftp.c:4502
+#: ../daemon/gvfsbackendsftp.c:5385
 msgid "File is directory"
 msgstr "文件是目录"
 
-#: ../daemon/gvfsafpvolume.c:405
+#: ../daemon/gvfsafpvolume.c:414
 msgid "Too many files open"
 msgstr "打开的文件过多"
 
-#: ../daemon/gvfsafpvolume.c:667 ../daemon/gvfsafpvolume.c:824
+#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsafpvolume.c:833
 msgid "Target file is open"
 msgstr "目标文件已打开"
 
-#: ../daemon/gvfsafpvolume.c:671 ../daemon/gvfsbackendburn.c:421
-#: ../daemon/gvfsbackenddav.c:2641 ../daemon/gvfsbackendsftp.c:1852
+#: ../daemon/gvfsafpvolume.c:680 ../daemon/gvfsbackendburn.c:421
+#: ../daemon/gvfsbackenddav.c:2630 ../daemon/gvfsbackendsftp.c:1861
 msgid "Directory not empty"
 msgstr "目录非空"
 
-#: ../daemon/gvfsafpvolume.c:675
+#: ../daemon/gvfsafpvolume.c:684
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "目标对象被标记为禁止删除(DeleteInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:679 ../daemon/gvfsafpvolume.c:1228
-#: ../daemon/gvfsafpvolume.c:2130
+#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:1237
+#: ../daemon/gvfsafpvolume.c:2139
 msgid "Target object doesn't exist"
 msgstr "目标对象不存在"
 
-#: ../daemon/gvfsafpvolume.c:683 ../daemon/gvfsafpvolume.c:836
-#: ../daemon/gvfsafpvolume.c:1032 ../daemon/gvfsafpvolume.c:1232
-#: ../daemon/gvfsafpvolume.c:2134
+#: ../daemon/gvfsafpvolume.c:692 ../daemon/gvfsafpvolume.c:845
+#: ../daemon/gvfsafpvolume.c:1041 ../daemon/gvfsafpvolume.c:1241
+#: ../daemon/gvfsafpvolume.c:2143
 msgid "Volume is read-only"
 msgstr "卷是只读的"
 
-#: ../daemon/gvfsafpvolume.c:820 ../daemon/gvfsafpvolume.c:1014
-#: ../daemon/gvfsafpvolume.c:1564 ../daemon/gvfsafpvolume.c:2002
-#: ../daemon/gvfsafpvolume.c:2646
+#: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1023
+#: ../daemon/gvfsafpvolume.c:1573 ../daemon/gvfsafpvolume.c:2011
+#: ../daemon/gvfsafpvolume.c:2655
 msgid "Not enough space on volume"
 msgstr "卷上空间不足"
 
-#: ../daemon/gvfsafpvolume.c:828 ../daemon/gvfsafpvolume.c:1411
-#: ../daemon/gvfsafpvolume.c:1568 ../daemon/gvfsbackendafp.c:285
-#: ../daemon/gvfsbackendafp.c:486 ../daemon/gvfsbackenddav.c:2306
-#: ../daemon/gvfsbackenddav.c:2603 ../daemon/gvfsbackenddav.c:2709
-#: ../daemon/gvfsbackendftp.c:753 ../daemon/gvfsbackendftp.c:934
-#: ../daemon/gvfsbackendftp.c:1374 ../daemon/gvfsbackendftp.c:1482
-#: ../daemon/gvfsbackendmtp.c:1417 ../daemon/gvfsbackendmtp.c:1528
-#: ../daemon/gvfsbackendsftp.c:4502 ../daemon/gvfsbackendsmb.c:2211
+#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1420
+#: ../daemon/gvfsafpvolume.c:1577 ../daemon/gvfsbackendafp.c:295
+#: ../daemon/gvfsbackendafp.c:498 ../daemon/gvfsbackenddav.c:2295
+#: ../daemon/gvfsbackenddav.c:2592 ../daemon/gvfsbackenddav.c:2698
+#: ../daemon/gvfsbackenddav.c:2832 ../daemon/gvfsbackenddav.c:3056
+#: ../daemon/gvfsbackendftp.c:758 ../daemon/gvfsbackendftp.c:939
+#: ../daemon/gvfsbackendftp.c:1379 ../daemon/gvfsbackendftp.c:1487
+#: ../daemon/gvfsbackendmtp.c:1527 ../daemon/gvfsbackendmtp.c:1660
+#: ../daemon/gvfsbackendmtp.c:1807 ../daemon/gvfsbackendsftp.c:4511
+#: ../daemon/gvfsbackendsmb.c:2217
 msgid "Target file already exists"
 msgstr "目标文件已存在"
 
-#: ../daemon/gvfsafpvolume.c:832 ../daemon/gvfsafpvolume.c:1024
+#: ../daemon/gvfsafpvolume.c:841 ../daemon/gvfsafpvolume.c:1033
 msgid "Ancestor directory doesn't exist"
 msgstr "上级目录不存在"
 
 #. Translators: flat means volume doesn't support directories
 #. (all files are in the volume root)
-#: ../daemon/gvfsafpvolume.c:1020
+#: ../daemon/gvfsafpvolume.c:1029
 msgid "Volume is flat and doesn't support directories"
 msgstr "卷是平的(flat),不支持目录"
 
-#: ../daemon/gvfsafpvolume.c:1028
+#: ../daemon/gvfsafpvolume.c:1037
 msgid "Target directory already exists"
 msgstr "目标目录已存在"
 
-#: ../daemon/gvfsafpvolume.c:1216 ../daemon/gvfsbackendafp.c:591
+#: ../daemon/gvfsafpvolume.c:1225 ../daemon/gvfsbackendafp.c:603
 msgid "Can't rename volume"
 msgstr "无法重命名卷"
 
-#: ../daemon/gvfsafpvolume.c:1220
+#: ../daemon/gvfsafpvolume.c:1229
 msgid "Object with that name already exists"
 msgstr "拥有该名字的对象已存在"
 
-#: ../daemon/gvfsafpvolume.c:1224
+#: ../daemon/gvfsafpvolume.c:1233
 msgid "Target object is marked as not renameable (RenameInhibit)"
 msgstr "目标对象被标记为禁止重命名(RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1399
+#: ../daemon/gvfsafpvolume.c:1408
 msgid "Can't move directory into one of its descendants"
 msgstr "不能将目录移入其子目录"
 
-#: ../daemon/gvfsafpvolume.c:1403
+#: ../daemon/gvfsafpvolume.c:1412
 msgid "Can't move sharepoint into a shared directory"
 msgstr "不能将 sharepoint 目录移入共享目录"
 
-#: ../daemon/gvfsafpvolume.c:1407
+#: ../daemon/gvfsafpvolume.c:1416
 msgid "Can't move a shared directory into the Trash"
 msgstr "不能将共享目录移入回收站"
 
-#: ../daemon/gvfsafpvolume.c:1415
+#: ../daemon/gvfsafpvolume.c:1424
 msgid "Object being moved is marked as not renameable (RenameInhibit)"
 msgstr "所移动的对象被标记为禁止重命名(RenameInhibit)"
 
-#: ../daemon/gvfsafpvolume.c:1419
+#: ../daemon/gvfsafpvolume.c:1428
 msgid "Object being moved doesn't exist"
 msgstr "所移动的对象不存在"
 
-#: ../daemon/gvfsafpvolume.c:1556
+#: ../daemon/gvfsafpvolume.c:1565
 msgid "Server doesn't support the FPCopyFile operation"
 msgstr "服务器不支持 FPCopyFile 操作"
 
-#: ../daemon/gvfsafpvolume.c:1560
+#: ../daemon/gvfsafpvolume.c:1569
 msgid "Unable to open source file for reading"
 msgstr "无法打开源文件读取"
 
-#: ../daemon/gvfsafpvolume.c:1572
+#: ../daemon/gvfsafpvolume.c:1581
 msgid "Source file and/or destination directory doesn't exist"
 msgstr "源文件和/或目标目录不存在"
 
-#: ../daemon/gvfsafpvolume.c:1576
+#: ../daemon/gvfsafpvolume.c:1585
 msgid "Source file is a directory"
 msgstr "源文件是一个目录"
 
 #. Translators: range conflict means
 #. requested data are locked by another user
-#: ../daemon/gvfsafpvolume.c:2008
+#: ../daemon/gvfsafpvolume.c:2017
 msgid "Range lock conflict exists"
 msgstr "存在范围锁冲突"
 
-#: ../daemon/gvfsafpvolume.c:2292 ../daemon/gvfsbackendmtp.c:1199
-#: ../daemon/gvfsbackendmtp.c:1346 ../daemon/gvfsbackendmtp.c:1537
-#: ../daemon/gvfsbackendmtp.c:2000
+#: ../daemon/gvfsafpvolume.c:2301 ../daemon/gvfsbackendmtp.c:1369
+#: ../daemon/gvfsbackendmtp.c:1388 ../daemon/gvfsbackendmtp.c:1535
+#: ../daemon/gvfsbackendmtp.c:1754 ../daemon/gvfsbackendmtp.c:2270
 msgid "Directory doesn't exist"
 msgstr "目录不存在"
 
-#: ../daemon/gvfsafpvolume.c:2296
+#: ../daemon/gvfsafpvolume.c:2305
 msgid "Target object is not a directory"
 msgstr "目标对象不是一个目录"
 
-#: ../daemon/gvfsafpvolume.c:2642
+#: ../daemon/gvfsafpvolume.c:2651
 msgid "File is not open for write access"
 msgstr "文件未以可写的方式打开"
 
-#: ../daemon/gvfsafpvolume.c:2650
+#: ../daemon/gvfsafpvolume.c:2659
 msgid "File is locked by another user"
 msgstr "文件已由其他用户锁住"
 
-#: ../daemon/gvfsafpvolume.c:2788
+#: ../daemon/gvfsafpvolume.c:2797
 msgid "File is not open for read access"
 msgstr "文件未以可读的方式打开"
 
-#: ../daemon/gvfsbackendafc.c:209
+#: ../daemon/gvfsbackendafc.c:212
 msgid "Internal Apple File Control error"
 msgstr "内部的苹果文件控制(AFC)错误"
 
-#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:737
-#: ../daemon/gvfsbackendmtp.c:1392 ../daemon/gvfsbackendmtp.c:1430
-#: ../daemon/gvfsbackendmtp.c:1622 ../daemon/gvfsbackendmtp.c:1669
-#: ../daemon/gvfsbackendmtp.c:1739 ../daemon/gvfsbackendmtp.c:2077
+#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:742
+#: ../daemon/gvfsbackendmtp.c:1582 ../daemon/gvfsbackendmtp.c:1598
+#: ../daemon/gvfsbackendmtp.c:1875 ../daemon/gvfsbackendmtp.c:1922
+#: ../daemon/gvfsbackendmtp.c:1991 ../daemon/gvfsbackendmtp.c:2347
 msgid "File does not exist"
 msgstr "文件不存在"
 
-#: ../daemon/gvfsbackendafc.c:217
+#: ../daemon/gvfsbackendafc.c:220
 msgid "The directory is not empty"
 msgstr "这个目录不是空的"
 
-#: ../daemon/gvfsbackendafc.c:221
+#: ../daemon/gvfsbackendafc.c:224
 msgid "The device did not respond"
 msgstr "这个设备没有响应"
 
-#: ../daemon/gvfsbackendafc.c:225
+#: ../daemon/gvfsbackendafc.c:228
 msgid "The connection was interrupted"
 msgstr "连接被中断"
 
-#: ../daemon/gvfsbackendafc.c:229
+#: ../daemon/gvfsbackendafc.c:232
 msgid "Invalid Apple File Control data received"
 msgstr "收到了无效的苹果文件控制数据"
 
-#: ../daemon/gvfsbackendafc.c:233
+#: ../daemon/gvfsbackendafc.c:236
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "未处理的苹果文件控制(AFC)错误(%d)"
 
-#: ../daemon/gvfsbackendafc.c:249
+#: ../daemon/gvfsbackendafc.c:252
 msgid "Listing applications installed on device failed"
 msgstr "列出设备上安装的应用失败"
 
-#: ../daemon/gvfsbackendafc.c:265
+#: ../daemon/gvfsbackendafc.c:268
 msgid "Accessing application icons on device failed"
 msgstr "访问设备上的应用图标失败"
 
-#: ../daemon/gvfsbackendafc.c:282
+#: ../daemon/gvfsbackendafc.c:285
 msgid "Lockdown Error: Invalid Argument"
 msgstr "锁定错误:无效的参数"
 
-#: ../daemon/gvfsbackendafc.c:290
+#: ../daemon/gvfsbackendafc.c:293
 msgid "Unable to connect"
 msgstr "无法连接"
 
-#: ../daemon/gvfsbackendafc.c:294
+#: ../daemon/gvfsbackendafc.c:297
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "未处理的锁定错误(%d)"
 
-#: ../daemon/gvfsbackendafc.c:311
+#: ../daemon/gvfsbackendafc.c:314
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice 错误:无效参数"
 
-#: ../daemon/gvfsbackendafc.c:315
+#: ../daemon/gvfsbackendafc.c:318
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
 msgstr "libimobiledevice 错误:没有发现设备。请确认 usbmuxd 已经设置好了。"
 
-#: ../daemon/gvfsbackendafc.c:319
+#: ../daemon/gvfsbackendafc.c:322
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "未处理的 libimobiledevice 错误(%d)"
 
-#: ../daemon/gvfsbackendafc.c:412
+#: ../daemon/gvfsbackendafc.c:417
 msgid "Try again"
 msgstr "重试"
 
-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackend.c:979
+#: ../daemon/gvfsbackendafc.c:417 ../daemon/gvfsbackend.c:979
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:762
 msgid "Cancel"
 msgstr "取消"
 
-#: ../daemon/gvfsbackendafc.c:430 ../daemon/gvfsbackendarchive.c:608
-#: ../daemon/gvfsbackendarchive.c:637 ../daemon/gvfsbackenddav.c:1833
-#: ../daemon/gvfsbackendhttp.c:310 ../daemon/gvfsbackendobexftp.c:887
+#: ../daemon/gvfsbackendafc.c:435 ../daemon/gvfsbackendarchive.c:635
+#: ../daemon/gvfsbackendarchive.c:664 ../daemon/gvfsbackenddav.c:1826
+#: ../daemon/gvfsbackendhttp.c:256 ../daemon/gvfsbackendobexftp.c:887
 #: ../daemon/gvfsbackendobexftp.c:903 ../daemon/gvfsbackendobexftp.c:922
 #: ../daemon/gvfsbackendsmb.c:712
 msgid "Invalid mount spec"
 msgstr "无效的挂载描述"
 
-#: ../daemon/gvfsbackendafc.c:436 ../daemon/gvfsbackendafc.c:466
+#: ../daemon/gvfsbackendafc.c:441 ../daemon/gvfsbackendafc.c:471
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "无效的 AFC 位置:必须是 afc://uuid:port-number 格式"
 
-#: ../daemon/gvfsbackendafc.c:452
+#: ../daemon/gvfsbackendafc.c:457
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "苹果移动设备"
 
-#: ../daemon/gvfsbackendafc.c:457
+#: ../daemon/gvfsbackendafc.c:462
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "苹果移动设备,已越狱"
 
-#: ../daemon/gvfsbackendafc.c:462
+#: ../daemon/gvfsbackendafc.c:467
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "苹果移动设备上的文件"
@@ -636,7 +644,7 @@ msgstr "苹果移动设备上的文件"
 #. translators:
 #. * This is the device name, with the service being browsed in brackets, eg.:
 #. * Alan Smithee's iPhone (jailbreak)
-#: ../daemon/gvfsbackendafc.c:521
+#: ../daemon/gvfsbackendafc.c:526
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (越狱)"
@@ -644,7 +652,7 @@ msgstr "%s (越狱)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:528 ../monitor/afc/afcvolume.c:130
+#: ../daemon/gvfsbackendafc.c:533 ../monitor/afc/afcvolume.c:184
 #, c-format
 msgid "Documents on %s"
 msgstr "%s 上的文档"
@@ -652,35 +660,36 @@ msgstr "%s 上的文档"
 #. translators:
 #. * %s is the device name. 'Try again' is the caption of the button
 #. * shown in the dialog which is defined above.
-#: ../daemon/gvfsbackendafc.c:623
+#: ../daemon/gvfsbackendafc.c:637
 #, c-format
 msgid ""
 "The device “%s” is locked. Enter the passcode on the device and click “Try "
 "again”."
 msgstr "设备“%s”被锁定。请输入设备上的密码并点击“重试”。"
 
-#: ../daemon/gvfsbackendafc.c:967 ../daemon/gvfsbackendarchive.c:714
-#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1848
-#: ../daemon/gvfsbackendobexftp.c:1099 ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:803 ../daemon/gvfsbackendtrash.c:233
+#: ../daemon/gvfsbackendafc.c:981 ../daemon/gvfsbackendarchive.c:742
+#: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgphoto2.c:1848
+#: ../daemon/gvfsbackendmtp.c:2013 ../daemon/gvfsbackendobexftp.c:1099
+#: ../daemon/gvfsbackendrecent.c:122 ../daemon/gvfsbackendsmb.c:803
+#: ../daemon/gvfsbackendtrash.c:234
 msgid "Can't open directory"
 msgstr "无法打开目录"
 
-#: ../daemon/gvfsbackendafc.c:1170 ../daemon/gvfsbackendafc.c:2556
+#: ../daemon/gvfsbackendafc.c:1184 ../daemon/gvfsbackendafc.c:2578
 msgid "Backups are not yet supported."
 msgstr "尚不支持备份。"
 
-#: ../daemon/gvfsbackendafc.c:1343
+#: ../daemon/gvfsbackendafc.c:1357
 msgid "Invalid seek type"
 msgstr "无效的搜索类型"
 
-#: ../daemon/gvfsbackendafc.c:2393 ../daemon/gvfsbackendafp.c:1778
-#: ../daemon/gvfsbackendftp.c:1088 ../daemon/gvfsbackendftp.c:1136
-#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendmtp.c:1726
-#: ../daemon/gvfsbackendmtp.c:1974 ../daemon/gvfsbackendmtp.c:2064
-#: ../daemon/gvfsbackendmtp.c:2134 ../daemon/gvfsbackendsftp.c:1856
-#: ../daemon/gvfsbackendsftp.c:4850 ../daemon/gvfsbackendsmb.c:1849
-#: ../daemon/gvfsftptask.c:395
+#: ../daemon/gvfsbackendafc.c:2415 ../daemon/gvfsbackendafp.c:1790
+#: ../daemon/gvfsbackendftp.c:1093 ../daemon/gvfsbackendftp.c:1141
+#: ../daemon/gvfsbackendftp.c:1162 ../daemon/gvfsbackendmtp.c:1978
+#: ../daemon/gvfsbackendmtp.c:2244 ../daemon/gvfsbackendmtp.c:2334
+#: ../daemon/gvfsbackendmtp.c:2404 ../daemon/gvfsbackendsftp.c:1865
+#: ../daemon/gvfsbackendsftp.c:4859 ../daemon/gvfsbackendsmb.c:1861
+#: ../daemon/gvfsftptask.c:403
 msgid "Operation unsupported"
 msgstr "不支持此操作"
 
@@ -699,10 +708,10 @@ msgstr "此文件不可挂载"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2101
-#: ../daemon/gvfsbackendftp.c:634 ../daemon/gvfsbackendobexftp.c:705
-#: ../daemon/gvfsbackendsftp.c:1717 ../daemon/gvfsbackendsmb.c:584
-#: ../daemon/gvfsbackendsmb.c:1537
+#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2113
+#: ../daemon/gvfsbackendftp.c:639 ../daemon/gvfsbackendobexftp.c:705
+#: ../daemon/gvfsbackendsftp.c:1726 ../daemon/gvfsbackendsmb.c:584
+#: ../daemon/gvfsbackendsmb.c:1546
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s 上的 %1$s"
@@ -713,74 +722,75 @@ msgstr "%2$s 上的 %1$s"
 msgid "%s"
 msgstr "%s"
 
-#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2136
-#: ../daemon/gvfsbackendarchive.c:597 ../daemon/gvfsbackendftp.c:668
-#: ../daemon/gvfsbackendsftp.c:1769
+#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2148
+#: ../daemon/gvfsbackendarchive.c:624 ../daemon/gvfsbackendftp.c:673
+#: ../daemon/gvfsbackendsftp.c:1778
 msgid "No hostname specified"
 msgstr "未指定主机名"
 
-#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2228
+#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2243
 msgid "Apple Filing Protocol Service"
 msgstr "苹果文件传送协议服务"
 
-#: ../daemon/gvfsbackendafp.c:275 ../daemon/gvfsbackendburn.c:875
-#: ../daemon/gvfsbackendftp.c:1474 ../daemon/gvfsbackendobexftp.c:1806
+#: ../daemon/gvfsbackendafp.c:285 ../daemon/gvfsbackendburn.c:875
+#: ../daemon/gvfsbackendftp.c:1479 ../daemon/gvfsbackendobexftp.c:1806
 msgid "Can't copy directory over directory"
 msgstr "无法将目录复制到目录"
 
-#: ../daemon/gvfsbackendafp.c:294 ../daemon/gvfsbackendburn.c:891
-#: ../daemon/gvfsbackendftp.c:1497 ../daemon/gvfsbackendmtp.c:1440
-#: ../daemon/gvfsbackendmtp.c:1549 ../daemon/gvfsbackendobexftp.c:1821
+#: ../daemon/gvfsbackendafp.c:304 ../daemon/gvfsbackendburn.c:891
+#: ../daemon/gvfsbackendftp.c:1502 ../daemon/gvfsbackendmtp.c:1643
+#: ../daemon/gvfsbackendmtp.c:1666 ../daemon/gvfsbackendmtp.c:1789
+#: ../daemon/gvfsbackendmtp.c:1813 ../daemon/gvfsbackendobexftp.c:1821
 msgid "Can't recursively copy directory"
 msgstr "无法递归复制目录"
 
-#: ../daemon/gvfsbackendafp.c:476 ../daemon/gvfsbackendsftp.c:4488
-#: ../daemon/gvfsbackendsmb.c:2200
+#: ../daemon/gvfsbackendafp.c:488 ../daemon/gvfsbackenddav.c:2760
+#: ../daemon/gvfsbackendsftp.c:4497 ../daemon/gvfsbackendsmb.c:2206
 msgid "Can't move directory over directory"
 msgstr "不能将目录移动到目录上"
 
-#: ../daemon/gvfsbackendafp.c:1257 ../daemon/gvfsbackendafp.c:1356
+#: ../daemon/gvfsbackendafp.c:1269 ../daemon/gvfsbackendafp.c:1368
 msgid "backups not supported"
 msgstr "不支持备份"
 
-#: ../daemon/gvfsbackendafp.c:1271
+#: ../daemon/gvfsbackendafp.c:1283
 #, c-format
 msgid "Unable to create temporary file (%s)"
 msgstr "无法创建临时文件(%s)"
 
-#: ../daemon/gvfsbackendafp.c:1345 ../daemon/gvfsbackenddav.c:2387
-#: ../daemon/gvfsbackendsftp.c:3476 ../daemon/gvfsbackendsmb.c:1235
+#: ../daemon/gvfsbackendafp.c:1357 ../daemon/gvfsbackenddav.c:2376
+#: ../daemon/gvfsbackendsftp.c:3485 ../daemon/gvfsbackendsmb.c:1235
 msgid "The file was externally modified"
 msgstr "文件被其它程序更改"
 
-#: ../daemon/gvfsbackendafp.c:1762 ../daemon/gvfsbackendftp.c:1129
-#: ../daemon/gvfsbackendsftp.c:4860
+#: ../daemon/gvfsbackendafp.c:1774 ../daemon/gvfsbackendftp.c:1134
+#: ../daemon/gvfsbackendsftp.c:4869
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "无效的属性类型(预期为 uint32)"
 
 #. Translators: first %s is volumename, second username and third servername
-#: ../daemon/gvfsbackendafp.c:2096
+#: ../daemon/gvfsbackendafp.c:2108
 #, c-format
 msgid "%s for %s on %s"
 msgstr "%3$s 上 %2$s 的 %1$s"
 
-#: ../daemon/gvfsbackendafp.c:2145
+#: ../daemon/gvfsbackendafp.c:2157
 msgid "No volume specified"
 msgstr "未指定卷"
 
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
 #. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
-#: ../daemon/gvfsbackendarchive.c:336 ../daemon/gvfsbackendsftp.c:2306
+#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2315
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "%s 上的 /"
 
-#: ../daemon/gvfsbackendarchive.c:844 ../daemon/gvfsbackendburn.c:679
-#: ../daemon/gvfsbackendcomputer.c:728 ../daemon/gvfsbackenddnssd.c:464
-#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:744
-#: ../daemon/gvfsbackendsftp.c:3994 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendarchive.c:876 ../daemon/gvfsbackendburn.c:679
+#: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464
+#: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendnetwork.c:744
+#: ../daemon/gvfsbackendsftp.c:4003 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "此文件不是目录文件"
 
@@ -797,12 +807,12 @@ msgstr "无法创建临时目录"
 #: ../daemon/gvfsbackendburn.c:447 ../daemon/gvfsbackendburn.c:671
 #: ../daemon/gvfsbackendburn.c:716 ../daemon/gvfsbackendburn.c:742
 #: ../daemon/gvfsbackendburn.c:780 ../daemon/gvfsbackendburn.c:971
-#: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:794
+#: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:799
 #: ../daemon/gvfsbackendgphoto2.c:1246 ../daemon/gvfsbackendgphoto2.c:2169
-#: ../daemon/gvfsbackendgphoto2.c:2887 ../daemon/gvfsbackendrecent.c:105
-#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1860
-#: ../daemon/gvfsbackendsftp.c:2990 ../daemon/gvfsbackendsftp.c:3003
-#: ../daemon/gvfsbackendsftp.c:3023 ../daemon/gvfsbackendtrash.c:217
+#: ../daemon/gvfsbackendgphoto2.c:2887 ../daemon/gvfsbackendrecent.c:106
+#: ../daemon/gvfsbackendrecent.c:287 ../daemon/gvfsbackendsftp.c:1869
+#: ../daemon/gvfsbackendsftp.c:2999 ../daemon/gvfsbackendsftp.c:3012
+#: ../daemon/gvfsbackendsftp.c:3032 ../daemon/gvfsbackendtrash.c:218
 #, c-format
 msgid "No such file or directory"
 msgstr "文件或目录不存在"
@@ -828,7 +838,7 @@ msgstr "文件已存在"
 #: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:121
 #: ../daemon/gvfsjobcreatemonitor.c:143 ../daemon/gvfsjobcreatemonitor.c:154
 #: ../daemon/gvfsjobcreatemonitor.c:177 ../daemon/gvfsjobcreatemonitor.c:195
-#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:271
+#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:272
 #: ../daemon/gvfsjobmakedirectory.c:108 ../daemon/gvfsjobmount.c:112
 #: ../daemon/gvfsjobmountmountable.c:138 ../daemon/gvfsjobmove.c:121
 #: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:184
@@ -844,7 +854,7 @@ msgstr "文件已存在"
 #: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobtruncate.c:112
 #: ../daemon/gvfsjobunmountmountable.c:157
 #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258
+#: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260
 #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1134
 #: ../monitor/udisks2/gvfsudisks2volume.c:1676
 msgid "Operation not supported by backend"
@@ -854,18 +864,19 @@ msgstr "后端不支持的操作"
 msgid "No such file or directory in target path"
 msgstr "目的路径中不存在此文件或目录"
 
-#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackendobexftp.c:1814
-#: ../daemon/gvfsbackendobexftp.c:1845 ../daemon/gvfsbackendsftp.c:1854
-#: ../daemon/gvfsbackendsftp.c:4658
+#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2799
+#: ../daemon/gvfsbackendobexftp.c:1814 ../daemon/gvfsbackendobexftp.c:1845
+#: ../daemon/gvfsbackendsftp.c:1863 ../daemon/gvfsbackendsftp.c:4667
 msgid "Target file exists"
 msgstr "目标文件已存在"
 
-#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:811
+#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:812
+#: ../daemon/gvfsbackenddav.c:3141 ../daemon/gvfsbackenddav.c:3173
 #: ../daemon/gvfsbackendgphoto2.c:2537 ../daemon/gvfsbackendgphoto2.c:2750
 #: ../daemon/gvfsbackendgphoto2.c:2847 ../daemon/gvfsbackendgphoto2.c:2940
-#: ../daemon/gvfsbackendgphoto2.c:3548 ../daemon/gvfsbackendgphoto2.c:3558
-#: ../daemon/gvfsbackendsftp.c:5489 ../daemon/gvfsbackendsftp.c:5521
-#: ../daemon/gvfsbackendsftp.c:6007
+#: ../daemon/gvfsbackendgphoto2.c:3549 ../daemon/gvfsbackendgphoto2.c:3559
+#: ../daemon/gvfsbackendsftp.c:5499 ../daemon/gvfsbackendsftp.c:5531
+#: ../daemon/gvfsbackendsftp.c:6017
 msgid "Not supported"
 msgstr "不支持"
 
@@ -884,7 +895,7 @@ msgstr ""
 "一个或更多应用程序正在占用卷。"
 
 #: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1555
-#: ../daemon/gvfsbackendmtp.c:698
+#: ../daemon/gvfsbackendmtp.c:850
 msgid "Cannot create gudev client"
 msgstr "无法创建 gudev 客户端"
 
@@ -965,118 +976,126 @@ msgstr "文件不存在或不是音轨"
 msgid "Audio CD File System Service"
 msgstr "音频 CD 文件系统服务"
 
-#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:770
+#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:771
 msgid "Computer"
 msgstr "计算机"
 
-#: ../daemon/gvfsbackendcomputer.c:531
+#: ../daemon/gvfsbackendcomputer.c:532
 msgid "File System"
 msgstr "文件系统"
 
-#: ../daemon/gvfsbackendcomputer.c:660
+#: ../daemon/gvfsbackendcomputer.c:661
 msgid "Can't open mountable file"
 msgstr "无法打开可挂载文件"
 
-#: ../daemon/gvfsbackendcomputer.c:857 ../daemon/gvfsbackendsftp.c:1174
+#: ../daemon/gvfsbackendcomputer.c:858
 #, c-format
 msgid "Internal error: %s"
 msgstr "内部错误:%s"
 
-#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1007
+#: ../daemon/gvfsbackendcomputer.c:890 ../daemon/gvfsbackendcomputer.c:1008
 msgid "Can't mount file"
 msgstr "无法挂载文件"
 
-#: ../daemon/gvfsbackendcomputer.c:900
+#: ../daemon/gvfsbackendcomputer.c:901
 msgid "No medium in the drive"
 msgstr "驱动器中没有介质"
 
-#: ../daemon/gvfsbackendcomputer.c:957 ../daemon/gvfsbackendcomputer.c:1052
-#: ../daemon/gvfsbackendcomputer.c:1158 ../daemon/gvfsbackendcomputer.c:1248
-#: ../daemon/gvfsbackendcomputer.c:1321 ../daemon/gvfsbackendcomputer.c:1390
+#: ../daemon/gvfsbackendcomputer.c:958 ../daemon/gvfsbackendcomputer.c:1053
+#: ../daemon/gvfsbackendcomputer.c:1159 ../daemon/gvfsbackendcomputer.c:1249
+#: ../daemon/gvfsbackendcomputer.c:1322 ../daemon/gvfsbackendcomputer.c:1391
 msgid "Not a mountable file"
 msgstr "非可挂载文件"
 
-#: ../daemon/gvfsbackendcomputer.c:1071
+#: ../daemon/gvfsbackendcomputer.c:1072
 msgid "Can't unmount file"
 msgstr "无法卸载文件"
 
-#: ../daemon/gvfsbackendcomputer.c:1201
+#: ../daemon/gvfsbackendcomputer.c:1202
 msgid "Can't eject file"
 msgstr "无法弹出文件"
 
-#: ../daemon/gvfsbackendcomputer.c:1268 ../daemon/gvfsbackendcomputer.c:1275
+#: ../daemon/gvfsbackendcomputer.c:1269 ../daemon/gvfsbackendcomputer.c:1276
 msgid "Can't start drive"
 msgstr "无法启动驱动器"
 
-#: ../daemon/gvfsbackendcomputer.c:1341 ../daemon/gvfsbackendcomputer.c:1348
+#: ../daemon/gvfsbackendcomputer.c:1342 ../daemon/gvfsbackendcomputer.c:1349
 msgid "Can't stop drive"
 msgstr "无法停止驱动器"
 
-#: ../daemon/gvfsbackendcomputer.c:1405 ../daemon/gvfsbackendcomputer.c:1412
+#: ../daemon/gvfsbackendcomputer.c:1406 ../daemon/gvfsbackendcomputer.c:1413
 msgid "Can't poll file"
 msgstr "无法轮询文件"
 
 #. Translators: This is the name of the WebDAV share constructed as
 #. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
 #. the second %s and only shown if it is not the default http(s) port.
-#: ../daemon/gvfsbackenddav.c:482
+#: ../daemon/gvfsbackenddav.c:490
 #, c-format
 msgid "%s on %s%s"
 msgstr "%2$s%3$s 上的 %1$s"
 
-#: ../daemon/gvfsbackenddav.c:674 ../daemon/gvfsbackenddav.c:1923
-#: ../daemon/gvfsbackendhttp.c:256
+#: ../daemon/gvfsbackenddav.c:654 ../daemon/gvfsbackenddav.c:1916
+#: ../daemon/gvfsbackendhttp.c:202
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP 错误:%s"
 
-#: ../daemon/gvfsbackenddav.c:691
+#: ../daemon/gvfsbackenddav.c:671
 msgid "Could not parse response"
 msgstr "无法解析响应"
 
-#: ../daemon/gvfsbackenddav.c:700
+#: ../daemon/gvfsbackenddav.c:680
 msgid "Empty response"
 msgstr "空响应"
 
-#: ../daemon/gvfsbackenddav.c:708
+#: ../daemon/gvfsbackenddav.c:688
 msgid "Unexpected reply from server"
 msgstr "服务器给出意外回复"
 
-#: ../daemon/gvfsbackenddav.c:1407 ../daemon/gvfsbackenddav.c:2053
-#: ../daemon/gvfsbackenddav.c:2142 ../daemon/gvfsbackenddav.c:2243
+#: ../daemon/gvfsbackenddav.c:1398 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2130 ../daemon/gvfsbackenddav.c:2232
 msgid "Response invalid"
 msgstr "响应无效"
 
-#: ../daemon/gvfsbackenddav.c:1550
+#: ../daemon/gvfsbackenddav.c:1541
 msgid "WebDAV share"
 msgstr "WebDAV 共享"
 
 #. translators: %s here is the hostname
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackenddav.c:1552 ../daemon/gvfsbackendftp.c:491
+#: ../daemon/gvfsbackenddav.c:1543 ../daemon/gvfsbackendftp.c:496
 #: ../daemon/gvfsbackendsftp.c:980
 #, c-format
 msgid "Enter password for %s"
 msgstr "输入 %s 的密码"
 
-#: ../daemon/gvfsbackenddav.c:1555
+#: ../daemon/gvfsbackenddav.c:1546
 msgid "Please enter proxy password"
 msgstr "请输入代理密码"
 
-#: ../daemon/gvfsbackenddav.c:1927 ../daemon/gvfsbackenddav.c:1931
+#: ../daemon/gvfsbackenddav.c:1920 ../daemon/gvfsbackenddav.c:1924
 msgid "Not a WebDAV enabled share"
 msgstr "不是启用了 WebDAV 的共享"
 
-#: ../daemon/gvfsbackenddav.c:2007 ../daemon/gvfsbackenddav.c:2097
-#: ../daemon/gvfsbackenddav.c:2170 ../daemon/gvfsbackenddav.c:2277
+#: ../daemon/gvfsbackenddav.c:1995 ../daemon/gvfsbackenddav.c:2085
+#: ../daemon/gvfsbackenddav.c:2158 ../daemon/gvfsbackenddav.c:2266
 msgid "Could not create request"
 msgstr "无法创建请求"
 
-#: ../daemon/gvfsbackenddav.c:2418 ../daemon/gvfsbackendsmb.c:1271
-#: ../daemon/gvfsbackendsmb.c:2228
+#: ../daemon/gvfsbackenddav.c:2407 ../daemon/gvfsbackenddav.c:2731
+#: ../daemon/gvfsbackendsmb.c:1271 ../daemon/gvfsbackendsmb.c:2234
 msgid "Backup file creation failed"
 msgstr "创建备份文件失败"
 
+#: ../daemon/gvfsbackenddav.c:2765
+msgid "Can't move over directory"
+msgstr "无法移动到目录上"
+
+#: ../daemon/gvfsbackenddav.c:2928
+msgid "File length changed during transfer"
+msgstr "文件长度在传输时被改变"
+
 #: ../daemon/gvfsbackenddnssd.c:511 ../daemon/gvfsbackendnetwork.c:462
 msgid "Local Network"
 msgstr "局域网"
@@ -1096,22 +1115,22 @@ msgid "Network"
 msgstr "网络"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:488 ../daemon/gvfsbackendsftp.c:973
+#: ../daemon/gvfsbackendftp.c:493 ../daemon/gvfsbackendsftp.c:973
 #, c-format
 msgid "Enter password for %s on %s"
 msgstr "请输入 %2$s 上 %1$s 的密码"
 
-#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:997
+#: ../daemon/gvfsbackendftp.c:523 ../daemon/gvfsbackendsftp.c:997
 #: ../daemon/gvfsbackendsmbbrowse.c:1041 ../daemon/gvfsbackendsmb.c:667
 msgid "Password dialog cancelled"
 msgstr "密码对话框被取消"
 
-#: ../daemon/gvfsbackendftp.c:728
+#: ../daemon/gvfsbackendftp.c:733
 msgid "Insufficient permissions"
 msgstr "权限不足"
 
-#: ../daemon/gvfsbackendftp.c:982 ../daemon/gvfsbackendftp.c:1337
-#: ../daemon/gvfsbackendsftp.c:3320 ../daemon/gvfsbackendsftp.c:3522
+#: ../daemon/gvfsbackendftp.c:987 ../daemon/gvfsbackendftp.c:1342
+#: ../daemon/gvfsbackendsftp.c:3329 ../daemon/gvfsbackendsftp.c:3531
 msgid "backups not supported yet"
 msgstr "尚不支持备份"
 
@@ -1166,7 +1185,7 @@ msgstr "相机"
 msgid "Audio Player"
 msgstr "音频播放器"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:690
+#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendmtp.c:842
 msgid "No device specified"
 msgstr "未指定设备"
 
@@ -1221,7 +1240,7 @@ msgstr "获取文件时出错"
 msgid "Error getting data from file"
 msgstr "从文件中获取数据时出错"
 
-#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:1835
+#: ../daemon/gvfsbackendgphoto2.c:1947 ../daemon/gvfsbackendmtp.c:2105
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "图标识别符“%s”的格式错误"
@@ -1231,7 +1250,7 @@ msgstr "图标识别符“%s”的格式错误"
 msgid "Error seeking in stream on camera %s"
 msgstr "在照相机 %s 上的流搜索时出错"
 
-#: ../daemon/gvfsbackendgphoto2.c:2163 ../daemon/gvfsbackendsftp.c:2993
+#: ../daemon/gvfsbackendgphoto2.c:2163 ../daemon/gvfsbackendsftp.c:3002
 #: ../daemon/gvfsbackendsmbbrowse.c:1469
 msgid "Not a directory"
 msgstr "不是目录"
@@ -1273,7 +1292,7 @@ msgstr "目录“%s”非空"
 msgid "Error deleting directory"
 msgstr "删除目录时出错"
 
-#: ../daemon/gvfsbackendgphoto2.c:2897 ../daemon/gvfsbackendgphoto2.c:3634
+#: ../daemon/gvfsbackendgphoto2.c:2897 ../daemon/gvfsbackendgphoto2.c:3642
 msgid "Error deleting file"
 msgstr "删除文件时出错"
 
@@ -1317,7 +1336,7 @@ msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "不支持(源为文件,目标却为目录)"
 
-#: ../daemon/gvfsbackendhttp.c:252
+#: ../daemon/gvfsbackendhttp.c:198
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP 客户端错误:%s"
@@ -1326,88 +1345,89 @@ msgstr "HTTP 客户端错误:%s"
 msgid "Directory notification not supported"
 msgstr "不支持目录通知"
 
-#: ../daemon/gvfsbackendmtp.c:505
+#: ../daemon/gvfsbackendmtp.c:556
 msgid "Unknown error."
 msgstr "未知错误。"
 
-#: ../daemon/gvfsbackendmtp.c:511
+#: ../daemon/gvfsbackendmtp.c:562
 #, c-format
 msgid "libmtp error: %s"
 msgstr "libmtp 错误:%s"
 
-#: ../daemon/gvfsbackendmtp.c:644
-#| msgid "Unexpected host uri format."
+#: ../daemon/gvfsbackendmtp.c:796
 msgid "Unexpected host URI format."
 msgstr "主机 URI 格式异常。"
 
-#: ../daemon/gvfsbackendmtp.c:654
-#| msgid "Malformed host uri."
+#: ../daemon/gvfsbackendmtp.c:806
 msgid "Malformed host URI."
 msgstr "主机 URI 有误。"
 
-#: ../daemon/gvfsbackendmtp.c:667
+#: ../daemon/gvfsbackendmtp.c:819
 msgid "Couldn't find matching udev device."
 msgstr "找不到匹配的 udev 设备。"
 
-#: ../daemon/gvfsbackendmtp.c:811
+#: ../daemon/gvfsbackendmtp.c:974
 msgid "No MTP devices found"
 msgstr "未找到 MTP 设备"
 
-#: ../daemon/gvfsbackendmtp.c:816
+#: ../daemon/gvfsbackendmtp.c:979
 msgid "Unable to connect to MTP device"
 msgstr "无法连接 MTP 设备"
 
-#: ../daemon/gvfsbackendmtp.c:821
+#: ../daemon/gvfsbackendmtp.c:984
 msgid "Unable to allocate memory while detecting MTP devices"
 msgstr "在检测 MTP 设备时无法分配内存"
 
-#: ../daemon/gvfsbackendmtp.c:827
+#: ../daemon/gvfsbackendmtp.c:990
 msgid "Generic libmtp error"
 msgstr "常规 libmtp 错误"
 
-#: ../daemon/gvfsbackendmtp.c:844
+#: ../daemon/gvfsbackendmtp.c:1007
 #, c-format
 msgid "Unable to open MTP device '%s'"
 msgstr "无法打开 MTP 设备“%s”"
 
-#: ../daemon/gvfsbackendmtp.c:864
-#| msgid "File not found"
+#: ../daemon/gvfsbackendmtp.c:1027
 msgid "Device not found"
 msgstr "找不到设备"
 
-#: ../daemon/gvfsbackendmtp.c:903
+#: ../daemon/gvfsbackendmtp.c:1066
 msgid "Unnamed Device"
 msgstr "未命名的设备"
 
-#: ../daemon/gvfsbackendmtp.c:1125 ../daemon/gvfsbackendmtp.c:1218
-#: ../daemon/gvfsbackendmtp.c:1272
+#: ../daemon/gvfsbackendmtp.c:1295 ../daemon/gvfsbackendmtp.c:1399
+#: ../daemon/gvfsbackendmtp.c:1453
 msgid "File not found"
 msgstr "找不到文件"
 
-#: ../daemon/gvfsbackendmtp.c:1335
+#: ../daemon/gvfsbackendmtp.c:1516
 msgid "Cannot make directory in this location"
 msgstr "不能在此位置创建目录"
 
-#: ../daemon/gvfsbackendmtp.c:1397 ../daemon/gvfsbackendmtp.c:1627
-#: ../daemon/gvfsbackendmtp.c:1674 ../daemon/gvfsbackendmtp.c:1744
-#: ../daemon/gvfsbackendmtp.c:2082 ../daemon/gvfsbackendmtp.c:2150
+#: ../daemon/gvfsbackendmtp.c:1587 ../daemon/gvfsbackendmtp.c:1880
+#: ../daemon/gvfsbackendmtp.c:1927 ../daemon/gvfsbackendmtp.c:1996
+#: ../daemon/gvfsbackendmtp.c:2352 ../daemon/gvfsbackendmtp.c:2420
 #: ../daemon/gvfsbackendsmbbrowse.c:1209
 msgid "Not a regular file"
 msgstr "非常规文件"
 
-#: ../daemon/gvfsbackendmtp.c:1504
+#: ../daemon/gvfsbackendmtp.c:1633 ../daemon/gvfsbackendmtp.c:1779
+msgid "Target is a directory"
+msgstr "目标是一个目录"
+
+#: ../daemon/gvfsbackendmtp.c:1638 ../daemon/gvfsbackendmtp.c:1784
+msgid "Can't merge directories"
+msgstr "不能合并目录"
+
+#: ../daemon/gvfsbackendmtp.c:1731 ../daemon/gvfsbackendmtp.c:2262
 msgid "Cannot write to this location"
 msgstr "无法写入此位置"
 
-#: ../daemon/gvfsbackendmtp.c:1816
+#: ../daemon/gvfsbackendmtp.c:2087
 #, c-format
 msgid "No thumbnail for entity '%s'"
 msgstr "没有实体“%s”的缩略图"
 
-#: ../daemon/gvfsbackendmtp.c:1992 ../daemon/gvfsftptask.c:411
-msgid "Invalid filename"
-msgstr "无效文件名"
-
 #: ../daemon/gvfsbackendnetwork.c:168
 msgid "File Sharing"
 msgstr "文件分享"
@@ -1438,18 +1458,18 @@ msgstr "丢失与设备的连接"
 msgid "Device requires a software update"
 msgstr "设备要求一个软件更新"
 
-#: ../daemon/gvfsbackendobexftp.c:1882 ../daemon/gvfsbackendsmb.c:2102
+#: ../daemon/gvfsbackendobexftp.c:1882 ../daemon/gvfsbackendsmb.c:2108
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "删除文件失败:%s"
 
-#: ../daemon/gvfsbackendrecent.c:238
+#: ../daemon/gvfsbackendrecent.c:266
 msgid "The recent folder may not be deleted"
 msgstr "最近的文件夹 不能删除"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendrecent.c:548 ../daemon/gvfsbackendrecent.c:662
+#: ../daemon/gvfsbackendrecent.c:580 ../daemon/gvfsbackendrecent.c:694
 msgid "Recent"
 msgstr "最近"
 
@@ -1533,57 +1553,67 @@ msgstr "登录对话框被取消"
 msgid "Can't send host identity confirmation"
 msgstr "无法发送主机身份确认信息"
 
-#: ../daemon/gvfsbackendsftp.c:1664 ../daemon/gvfsbackendsftp.c:1692
+#: ../daemon/gvfsbackendsftp.c:1174
+#, c-format
+msgid "The connection is closed (the underlying SSH process died)"
+msgstr "连接被关闭 (底层 SSH 进程死掉了)"
+
+#: ../daemon/gvfsbackendsftp.c:1175
+#, c-format
+msgid "Internal error: Unknown Error"
+msgstr "内部错误:未知原因"
+
+#: ../daemon/gvfsbackendsftp.c:1673 ../daemon/gvfsbackendsftp.c:1701
 msgid "Protocol error"
 msgstr "协议错误"
 
-#: ../daemon/gvfsbackendsftp.c:1759
+#: ../daemon/gvfsbackendsftp.c:1768
 msgid "Unable to find supported SSH command"
 msgstr "无法找到支持的 SSH 命令"
 
-#: ../daemon/gvfsbackendsftp.c:2033 ../daemon/gvfsbackendsftp.c:2435
-#: ../daemon/gvfsbackendsftp.c:2494 ../daemon/gvfsbackendsftp.c:2505
-#: ../daemon/gvfsbackendsftp.c:2561 ../daemon/gvfsbackendsftp.c:2650
-#: ../daemon/gvfsbackendsftp.c:2700 ../daemon/gvfsbackendsftp.c:2753
-#: ../daemon/gvfsbackendsftp.c:2828 ../daemon/gvfsbackendsftp.c:2935
-#: ../daemon/gvfsbackendsftp.c:3066 ../daemon/gvfsbackendsftp.c:3148
-#: ../daemon/gvfsbackendsftp.c:3222 ../daemon/gvfsbackendsftp.c:3234
-#: ../daemon/gvfsbackendsftp.c:3292 ../daemon/gvfsbackendsftp.c:3334
-#: ../daemon/gvfsbackendsftp.c:3548 ../daemon/gvfsbackendsftp.c:3580
-#: ../daemon/gvfsbackendsftp.c:3636 ../daemon/gvfsbackendsftp.c:3693
-#: ../daemon/gvfsbackendsftp.c:3762 ../daemon/gvfsbackendsftp.c:4027
-#: ../daemon/gvfsbackendsftp.c:4094 ../daemon/gvfsbackendsftp.c:4224
-#: ../daemon/gvfsbackendsftp.c:4331 ../daemon/gvfsbackendsftp.c:4391
-#: ../daemon/gvfsbackendsftp.c:4426 ../daemon/gvfsbackendsftp.c:4454
-#: ../daemon/gvfsbackendsftp.c:4562 ../daemon/gvfsbackendsftp.c:4616
-#: ../daemon/gvfsbackendsftp.c:4655 ../daemon/gvfsbackendsftp.c:4689
-#: ../daemon/gvfsbackendsftp.c:4723 ../daemon/gvfsbackendsftp.c:4738
-#: ../daemon/gvfsbackendsftp.c:4753 ../daemon/gvfsbackendsftp.c:4831
-#: ../daemon/gvfsbackendsftp.c:4992 ../daemon/gvfsbackendsftp.c:5027
-#: ../daemon/gvfsbackendsftp.c:5097 ../daemon/gvfsbackendsftp.c:5181
-#: ../daemon/gvfsbackendsftp.c:5263 ../daemon/gvfsbackendsftp.c:5304
-#: ../daemon/gvfsbackendsftp.c:5308 ../daemon/gvfsbackendsftp.c:5421
-#: ../daemon/gvfsbackendsftp.c:5425 ../daemon/gvfsbackendsftp.c:5651
-#: ../daemon/gvfsbackendsftp.c:5864 ../daemon/gvfsbackendsftp.c:5881
-#: ../daemon/gvfsbackendsftp.c:6013 ../daemon/gvfsbackendsftp.c:6041
+#: ../daemon/gvfsbackendsftp.c:2042 ../daemon/gvfsbackendsftp.c:2444
+#: ../daemon/gvfsbackendsftp.c:2503 ../daemon/gvfsbackendsftp.c:2514
+#: ../daemon/gvfsbackendsftp.c:2570 ../daemon/gvfsbackendsftp.c:2659
+#: ../daemon/gvfsbackendsftp.c:2709 ../daemon/gvfsbackendsftp.c:2762
+#: ../daemon/gvfsbackendsftp.c:2837 ../daemon/gvfsbackendsftp.c:2944
+#: ../daemon/gvfsbackendsftp.c:3075 ../daemon/gvfsbackendsftp.c:3157
+#: ../daemon/gvfsbackendsftp.c:3231 ../daemon/gvfsbackendsftp.c:3243
+#: ../daemon/gvfsbackendsftp.c:3301 ../daemon/gvfsbackendsftp.c:3343
+#: ../daemon/gvfsbackendsftp.c:3557 ../daemon/gvfsbackendsftp.c:3589
+#: ../daemon/gvfsbackendsftp.c:3645 ../daemon/gvfsbackendsftp.c:3702
+#: ../daemon/gvfsbackendsftp.c:3771 ../daemon/gvfsbackendsftp.c:4036
+#: ../daemon/gvfsbackendsftp.c:4103 ../daemon/gvfsbackendsftp.c:4233
+#: ../daemon/gvfsbackendsftp.c:4340 ../daemon/gvfsbackendsftp.c:4400
+#: ../daemon/gvfsbackendsftp.c:4435 ../daemon/gvfsbackendsftp.c:4463
+#: ../daemon/gvfsbackendsftp.c:4571 ../daemon/gvfsbackendsftp.c:4625
+#: ../daemon/gvfsbackendsftp.c:4664 ../daemon/gvfsbackendsftp.c:4698
+#: ../daemon/gvfsbackendsftp.c:4732 ../daemon/gvfsbackendsftp.c:4747
+#: ../daemon/gvfsbackendsftp.c:4762 ../daemon/gvfsbackendsftp.c:4840
+#: ../daemon/gvfsbackendsftp.c:5002 ../daemon/gvfsbackendsftp.c:5037
+#: ../daemon/gvfsbackendsftp.c:5107 ../daemon/gvfsbackendsftp.c:5191
+#: ../daemon/gvfsbackendsftp.c:5273 ../daemon/gvfsbackendsftp.c:5314
+#: ../daemon/gvfsbackendsftp.c:5318 ../daemon/gvfsbackendsftp.c:5431
+#: ../daemon/gvfsbackendsftp.c:5435 ../daemon/gvfsbackendsftp.c:5661
+#: ../daemon/gvfsbackendsftp.c:5874 ../daemon/gvfsbackendsftp.c:5891
+#: ../daemon/gvfsbackendsftp.c:6023 ../daemon/gvfsbackendsftp.c:6051
 msgid "Invalid reply received"
 msgstr "收到无效回复"
 
-#: ../daemon/gvfsbackendsftp.c:2294 ../daemon/gvfsbackendsmb.c:1544
+#: ../daemon/gvfsbackendsftp.c:2303 ../daemon/gvfsbackendsmb.c:1553
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr " (无效编码)"
 
-#: ../daemon/gvfsbackendsftp.c:2379
+#: ../daemon/gvfsbackendsftp.c:2388
 msgid "Failure"
 msgstr "失败"
 
-#: ../daemon/gvfsbackendsftp.c:2773
+#: ../daemon/gvfsbackendsftp.c:2782
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "创建备份文件出错:%s"
 
-#: ../daemon/gvfsbackendsftp.c:3398 ../daemon/gvfsbackendsftp.c:5332
+#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsftp.c:5342
 msgid "Unable to create temporary file"
 msgstr "无法创建临时文件"
 
@@ -1638,43 +1668,43 @@ msgstr "不支持此搜索类型"
 msgid "Backup file creation failed: %s"
 msgstr "创建备份文件失败:%s"
 
-#: ../daemon/gvfsbackendsmb.c:1864
+#: ../daemon/gvfsbackendsmb.c:1886
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "无效的属性类型(预期为 uint64)"
 
-#: ../daemon/gvfsbackendsmb.c:2051
+#: ../daemon/gvfsbackendsmb.c:2057
 msgid "Can't rename file, filename already exists"
 msgstr "无法重命名文件,文件名已存在"
 
-#: ../daemon/gvfsbackendsmb.c:2176
+#: ../daemon/gvfsbackendsmb.c:2182
 #, c-format
 msgid "Error moving file: %s"
 msgstr "移动文件失败:%s"
 
-#: ../daemon/gvfsbackendsmb.c:2248
+#: ../daemon/gvfsbackendsmb.c:2254
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "删除目标文件失败:%s"
 
-#: ../daemon/gvfsbackendsmb.c:2272
+#: ../daemon/gvfsbackendsmb.c:2278
 msgid "Can't recursively move directory"
 msgstr "无法递归删除目录"
 
-#: ../daemon/gvfsbackendsmb.c:2318
+#: ../daemon/gvfsbackendsmb.c:2324
 msgid "Windows Shares File System Service"
 msgstr "Windows 共享文件系统服务"
 
-#: ../daemon/gvfsbackendtrash.c:371 ../daemon/gvfsbackendtrash.c:427
+#: ../daemon/gvfsbackendtrash.c:399 ../daemon/gvfsbackendtrash.c:455
 msgid "The trash folder may not be deleted"
 msgstr "回收站文件夹可能不能被删除"
 
-#: ../daemon/gvfsbackendtrash.c:388 ../daemon/gvfsbackendtrash.c:441
+#: ../daemon/gvfsbackendtrash.c:416 ../daemon/gvfsbackendtrash.c:469
 msgid "Items in the trash may not be modified"
 msgstr "回收站中的项目不能修改"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendtrash.c:740 ../daemon/gvfsbackendtrash.c:852
+#: ../daemon/gvfsbackendtrash.c:768 ../daemon/gvfsbackendtrash.c:880
 msgid "Trash"
 msgstr "回收站"
 
@@ -1683,7 +1713,7 @@ msgid "Unexpected end of stream"
 msgstr "数据流意外结束"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:415 ../daemon/gvfsftptask.c:843
+#: ../daemon/gvfsftptask.c:423 ../daemon/gvfsftptask.c:851
 msgid "Invalid reply"
 msgstr "无效回复"
 
@@ -1701,42 +1731,42 @@ msgstr "创建主动 FTP 连接失败。"
 msgid "Filename contains invalid characters."
 msgstr "文件名包含无效字符。"
 
-#: ../daemon/gvfsftptask.c:261
+#: ../daemon/gvfsftptask.c:268
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP 服务器正忙。稍后重试"
 
-#: ../daemon/gvfsftptask.c:359
+#: ../daemon/gvfsftptask.c:367
 msgid "Accounts are unsupported"
 msgstr "不支持这些账户"
 
-#: ../daemon/gvfsftptask.c:363
-msgid "Host closed connection"
-msgstr "主机已关闭连接"
-
-#: ../daemon/gvfsftptask.c:367
+#: ../daemon/gvfsftptask.c:375
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr "无法打开数据连接。是不是您的防火墙不允许?"
 
-#: ../daemon/gvfsftptask.c:371
+#: ../daemon/gvfsftptask.c:379
 msgid "Data connection closed"
 msgstr "数据连接已关闭"
 
-#: ../daemon/gvfsftptask.c:378 ../daemon/gvfsftptask.c:382
+#: ../daemon/gvfsftptask.c:386 ../daemon/gvfsftptask.c:390
 msgid "Operation failed"
 msgstr "操作失败"
 
-#: ../daemon/gvfsftptask.c:387
+#: ../daemon/gvfsftptask.c:395
 msgid "No space left on server"
 msgstr "服务器上没有剩余空间了"
 
-#: ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsftptask.c:407
 msgid "Unsupported network protocol"
 msgstr "不支持的网络协议"
 
-#: ../daemon/gvfsftptask.c:407
+#: ../daemon/gvfsftptask.c:415
 msgid "Page type unknown"
 msgstr "页面类型未知"
 
+#: ../daemon/gvfsftptask.c:419
+msgid "Invalid filename"
+msgstr "无效文件名"
+
 #: ../daemon/gvfsjobmakesymlink.c:111
 msgid "Symlinks not supported by backend"
 msgstr "后端不支持符号链接"
@@ -1763,41 +1793,45 @@ msgstr ""
 msgid "File system is busy"
 msgstr "文件系统正忙"
 
-#: ../daemon/main.c:142 ../metadata/meta-daemon.c:482
+#: ../daemon/main.c:143 ../metadata/meta-daemon.c:483
 msgid "Replace old daemon."
 msgstr "替换旧守护进程。"
 
-#: ../daemon/main.c:143
+#: ../daemon/main.c:144
 msgid "Don't start fuse."
 msgstr "不启动 fuse。"
 
-#: ../daemon/main.c:157
+#: ../daemon/main.c:145 ../metadata/meta-daemon.c:484
+msgid "Show program version."
+msgstr "显示程序版本。"
+
+#: ../daemon/main.c:159
 msgid "GVFS Daemon"
 msgstr "GVFS 守护进程"
 
-#: ../daemon/main.c:160
+#: ../daemon/main.c:162
 msgid "Main daemon for GVFS"
 msgstr "GVFS 主守护进程"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:175 ../metadata/meta-daemon.c:507
+#: ../daemon/main.c:178 ../metadata/meta-daemon.c:510
 #, c-format
 msgid "%s: %s"
 msgstr "%s:%s"
 
-#: ../daemon/main.c:177 ../metadata/meta-daemon.c:509
-#: ../programs/gvfs-cat.c:168 ../programs/gvfs-cat.c:180
-#: ../programs/gvfs-copy.c:131 ../programs/gvfs-info.c:396
-#: ../programs/gvfs-ls.c:428 ../programs/gvfs-mime.c:95
-#: ../programs/gvfs-mime.c:105 ../programs/gvfs-mime.c:112
-#: ../programs/gvfs-mkdir.c:69 ../programs/gvfs-monitor-dir.c:124
-#: ../programs/gvfs-monitor-file.c:123 ../programs/gvfs-mount.c:1055
-#: ../programs/gvfs-move.c:119 ../programs/gvfs-open.c:76
-#: ../programs/gvfs-open.c:88 ../programs/gvfs-rename.c:73
-#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:176
-#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104
-#: ../programs/gvfs-tree.c:260
+#: ../daemon/main.c:180 ../metadata/meta-daemon.c:512
+#: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188
+#: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398
+#: ../programs/gvfs-ls.c:430 ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:113 ../programs/gvfs-mime.c:120
+#: ../programs/gvfs-mkdir.c:72 ../programs/gvfs-monitor-dir.c:127
+#: ../programs/gvfs-monitor-file.c:126 ../programs/gvfs-mount.c:1088
+#: ../programs/gvfs-move.c:142 ../programs/gvfs-open.c:78
+#: ../programs/gvfs-open.c:96 ../programs/gvfs-rename.c:82
+#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181
+#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106
+#: ../programs/gvfs-tree.c:263
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "请用“%s --help”获得更多信息。"
@@ -1846,11 +1880,11 @@ msgstr "无法删除元数据键值"
 msgid "Unable to move metadata keys"
 msgstr "无法移动元数据键值"
 
-#: ../metadata/meta-daemon.c:492
+#: ../metadata/meta-daemon.c:494
 msgid "GVFS Metadata Daemon"
 msgstr "GVFS 元数据守护进程"
 
-#: ../metadata/meta-daemon.c:495
+#: ../metadata/meta-daemon.c:497
 msgid "Metadata daemon for GVFS"
 msgstr "GVFS 的元数据守护进程"
 
@@ -1894,11 +1928,13 @@ msgstr "无论如何启动"
 msgid "One or more programs are preventing the unmount operation."
 msgstr "一个或更多程序阻止卸载操作。"
 
-#: ../monitor/gdu/ggdumount.c:985
+#. Translators: can't get block device with unencrypted data to unmount
+#: ../monitor/gdu/ggdumount.c:986
 msgid "Cannot get LUKS cleartext slave"
 msgstr "无法获取 LUKS 明文从属"
 
-#: ../monitor/gdu/ggdumount.c:1007
+#. Translators: can't get block device with unencrypted data from path
+#: ../monitor/gdu/ggdumount.c:1009
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "无法从“%s”路径获取 LUKS 明文从属"
@@ -2360,46 +2396,58 @@ msgstr "%s (%s)"
 msgid "GVfs UDisks2 Volume Monitor"
 msgstr "GVfs UDisks2 卷监视器"
 
+#: ../programs/gvfs-cat.c:38 ../programs/gvfs-copy.c:51
+#: ../programs/gvfs-info.c:42 ../programs/gvfs-ls.c:47
+#: ../programs/gvfs-mime.c:39 ../programs/gvfs-mkdir.c:36
+#: ../programs/gvfs-monitor-dir.c:41 ../programs/gvfs-monitor-file.c:41
+#: ../programs/gvfs-mount.c:68 ../programs/gvfs-move.c:47
+#: ../programs/gvfs-open.c:38 ../programs/gvfs-rename.c:34
+#: ../programs/gvfs-rm.c:36 ../programs/gvfs-save.c:54
+#: ../programs/gvfs-set-attribute.c:39 ../programs/gvfs-trash.c:71
+#: ../programs/gvfs-tree.c:39
+msgid "Show program version"
+msgstr "显示程序版本"
+
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:58
+#: ../programs/gvfs-cat.c:60
 #, c-format
 msgid "%s: %s: error opening file: %s\n"
 msgstr "%s: %s:打开文件出错:%s\n"
 
 #. Translators: the first %s is the program name, the
 #. second one is the URI of the file.
-#: ../programs/gvfs-cat.c:82
+#: ../programs/gvfs-cat.c:84
 #, c-format
 msgid "%s: %s, error writing to stdout"
 msgstr "%s: %s,写入 stdout(标准输出) 时出错"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:95
+#: ../programs/gvfs-cat.c:97
 #, c-format
 msgid "%s: %s: error reading: %s\n"
 msgstr "%s: %s:读取出错:%s\n"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:114
+#: ../programs/gvfs-cat.c:116
 #, c-format
 msgid "%s: %s:error closing: %s\n"
 msgstr "%s: %s:关闭出错:%s\n"
 
-#: ../programs/gvfs-cat.c:141 ../programs/gvfs-open.c:59
-#: ../programs/gvfs-rm.c:56
+#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61
+#: ../programs/gvfs-rm.c:58
 msgid "FILE"
 msgstr "文件"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-cat.c:144
+#: ../programs/gvfs-cat.c:146
 msgid "Concatenate files and print to the standard output."
 msgstr "合并文件并输出到标准输出。"
 
-#: ../programs/gvfs-cat.c:145
+#: ../programs/gvfs-cat.c:147
 msgid ""
 "gvfs-cat works just like the traditional cat utility, but using gvfs\n"
 "locations instead of local files: for example you can use something\n"
@@ -2409,7 +2457,7 @@ msgstr ""
 "位置而不是本地文件:例如,可以用 smb://server/resource/file.txt\n"
 "作为位置。"
 
-#: ../programs/gvfs-cat.c:149
+#: ../programs/gvfs-cat.c:151
 msgid ""
 "Note: just pipe through cat if you need its formatting options\n"
 "like -n, -T or other."
@@ -2417,255 +2465,254 @@ msgstr ""
 "注意:如需要 cat 的 -n, -T 之类格式化功能,\n"
 "可通过管道用 cat 过滤。"
 
-#: ../programs/gvfs-cat.c:166 ../programs/gvfs-copy.c:129
-#: ../programs/gvfs-info.c:394 ../programs/gvfs-ls.c:426
-#: ../programs/gvfs-mime.c:92 ../programs/gvfs-mkdir.c:67
-#: ../programs/gvfs-monitor-dir.c:122 ../programs/gvfs-monitor-file.c:121
-#: ../programs/gvfs-mount.c:1053 ../programs/gvfs-move.c:117
-#: ../programs/gvfs-open.c:74 ../programs/gvfs-rename.c:71
-#: ../programs/gvfs-rm.c:68 ../programs/gvfs-save.c:174
-#: ../programs/gvfs-set-attribute.c:147 ../programs/gvfs-trash.c:102
-#: ../programs/gvfs-tree.c:258
+#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:144
+#: ../programs/gvfs-info.c:396 ../programs/gvfs-ls.c:428
+#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:70
+#: ../programs/gvfs-monitor-dir.c:125 ../programs/gvfs-monitor-file.c:124
+#: ../programs/gvfs-mount.c:1086 ../programs/gvfs-move.c:140
+#: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:80
+#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179
+#: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104
+#: ../programs/gvfs-tree.c:261
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "解析命令行选项出错:%s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:178 ../programs/gvfs-open.c:86
+#: ../programs/gvfs-cat.c:186 ../programs/gvfs-open.c:94
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s:缺少位置"
 
-#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
+#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
 msgid "No target directory"
 msgstr "无目标目录"
 
-#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
+#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
 msgid "Show progress"
 msgstr "显示进度"
 
-#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
+#: ../programs/gvfs-copy.c:47 ../programs/gvfs-move.c:45
 msgid "Prompt before overwrite"
 msgstr "覆盖前提示"
 
-#: ../programs/gvfs-copy.c:47
+#: ../programs/gvfs-copy.c:48
 msgid "Preserve all attributes"
 msgstr "保留所有属性"
 
-#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
-#: ../programs/gvfs-save.c:43
+#: ../programs/gvfs-copy.c:49 ../programs/gvfs-move.c:46
+#: ../programs/gvfs-save.c:45
 msgid "Backup existing destination files"
 msgstr "备份已有目的文件"
 
-#: ../programs/gvfs-copy.c:49
+#: ../programs/gvfs-copy.c:50
 msgid "Never follow symbolic links"
 msgstr "从不跟随符号链接"
 
-#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
+#: ../programs/gvfs-copy.c:88 ../programs/gvfs-move.c:84
 #, c-format
-msgid "progress"
-msgstr "进度"
+msgid "Transferred %s out of %s (%s/s)"
+msgstr "已经传输了 %s 总计 %s (%s / 秒)"
 
-#: ../programs/gvfs-copy.c:119 ../programs/gvfs-move.c:107
+#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130
 msgid "SOURCE"
 msgstr "源"
 
-#: ../programs/gvfs-copy.c:119 ../programs/gvfs-move.c:107
-#: ../programs/gvfs-save.c:163
+#: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:130
+#: ../programs/gvfs-save.c:168
 msgid "DEST"
 msgstr "DEST"
 
-#: ../programs/gvfs-copy.c:120
+#: ../programs/gvfs-copy.c:135
 msgid "Copy one or more files from SOURCE to DEST."
 msgstr "复制 SOURCE 里的单个或多个文件至 DEST。"
 
-#: ../programs/gvfs-copy.c:139 ../programs/gvfs-move.c:127
-#: ../programs/gvfs-rename.c:81
+#: ../programs/gvfs-copy.c:160 ../programs/gvfs-move.c:156
+#: ../programs/gvfs-rename.c:96
 msgid "Missing operand\n"
 msgstr "操作数丢失\n"
 
-#: ../programs/gvfs-copy.c:147 ../programs/gvfs-move.c:135
+#: ../programs/gvfs-copy.c:168 ../programs/gvfs-move.c:164
 msgid "Too many arguments\n"
 msgstr "参数太多\n"
 
-#: ../programs/gvfs-copy.c:156 ../programs/gvfs-move.c:144
+#: ../programs/gvfs-copy.c:177 ../programs/gvfs-move.c:173
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "目标 %s 不是一个目录\n"
 
-#: ../programs/gvfs-copy.c:201
+#: ../programs/gvfs-copy.c:222 ../programs/gvfs-move.c:213
 #, c-format
-msgid "overwrite %s?"
-msgstr "要覆盖 %s ?"
+msgid "%s: overwrite ‘%s’? "
+msgstr "%s:要覆盖 %s ?"
 
-#: ../programs/gvfs-copy.c:215
+#: ../programs/gvfs-copy.c:237
 #, c-format
 msgid "Error copying file %s: %s\n"
 msgstr "复制 %s 文件出错:%s\n"
 
-#: ../programs/gvfs-info.c:37
+#: ../programs/gvfs-info.c:38
 msgid "List writable attributes"
 msgstr "列出可写属性"
 
-#: ../programs/gvfs-info.c:38
+#: ../programs/gvfs-info.c:39
 msgid "Get file system info"
 msgstr "获取文件系统信息"
 
-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:40
+#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:41
 msgid "The attributes to get"
 msgstr "获取的属性"
 
-#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:40
+#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:41
 msgid "ATTRIBUTES"
 msgstr "属性"
 
-#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:44
-#: ../programs/gvfs-set-attribute.c:37
+#: ../programs/gvfs-info.c:41 ../programs/gvfs-ls.c:45
+#: ../programs/gvfs-set-attribute.c:38
 msgid "Don't follow symbolic links"
 msgstr "不要跟随符号链接"
 
-#: ../programs/gvfs-info.c:50
+#: ../programs/gvfs-info.c:52
 msgid "invalid type"
 msgstr "无效类型"
 
-#: ../programs/gvfs-info.c:53
+#: ../programs/gvfs-info.c:55
 msgid "unknown"
 msgstr "未知"
 
-#: ../programs/gvfs-info.c:56
+#: ../programs/gvfs-info.c:58
 msgid "regular"
 msgstr "常规"
 
-#: ../programs/gvfs-info.c:59
+#: ../programs/gvfs-info.c:61
 msgid "directory"
 msgstr "目录"
 
-#: ../programs/gvfs-info.c:62
+#: ../programs/gvfs-info.c:64
 msgid "symlink"
 msgstr "符号链接"
 
-#: ../programs/gvfs-info.c:65
+#: ../programs/gvfs-info.c:67
 msgid "special"
 msgstr "特别"
 
-#: ../programs/gvfs-info.c:68
+#: ../programs/gvfs-info.c:70
 msgid "shortcut"
 msgstr "快捷方式"
 
-#: ../programs/gvfs-info.c:71
+#: ../programs/gvfs-info.c:73
 msgid "mountable"
 msgstr "可挂载"
 
-#: ../programs/gvfs-info.c:109
+#: ../programs/gvfs-info.c:111
 #, c-format
 msgid "attributes:\n"
 msgstr "属性:\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../programs/gvfs-info.c:161
+#: ../programs/gvfs-info.c:163
 #, c-format
 msgid "display name: %s\n"
 msgstr "显示名称:%s\n"
 
 #. Translators: This is a noun and represents and attribute of a file
-#: ../programs/gvfs-info.c:166
+#: ../programs/gvfs-info.c:168
 #, c-format
 msgid "edit name: %s\n"
 msgstr "编辑名称:%s\n"
 
-#: ../programs/gvfs-info.c:172
+#: ../programs/gvfs-info.c:174
 #, c-format
 msgid "name: %s\n"
 msgstr "名称:%s\n"
 
-#: ../programs/gvfs-info.c:179
+#: ../programs/gvfs-info.c:181
 #, c-format
 msgid "type: %s\n"
 msgstr "类型:%s\n"
 
-#: ../programs/gvfs-info.c:185
+#: ../programs/gvfs-info.c:187
 #, c-format
 msgid "size: "
 msgstr "大小: "
 
-#: ../programs/gvfs-info.c:190
+#: ../programs/gvfs-info.c:192
 #, c-format
 msgid "hidden\n"
 msgstr "隐藏\n"
 
-#: ../programs/gvfs-info.c:193
+#: ../programs/gvfs-info.c:195
 #, c-format
-#| msgid "Error: %s\n"
 msgid "uri: %s\n"
 msgstr "URI:%s\n"
 
-#: ../programs/gvfs-info.c:279
+#: ../programs/gvfs-info.c:281
 msgid "Copy with file"
 msgstr "与文件一起复制"
 
-#: ../programs/gvfs-info.c:283
+#: ../programs/gvfs-info.c:285
 msgid "Keep with file when moved"
 msgstr "移动时与文件一并保留"
 
-#: ../programs/gvfs-info.c:320
+#: ../programs/gvfs-info.c:322
 #, c-format
 msgid "Error getting writable attributes: %s\n"
 msgstr "获取可写属性出错:%s\n"
 
-#: ../programs/gvfs-info.c:325
+#: ../programs/gvfs-info.c:327
 #, c-format
 msgid "Settable attributes:\n"
 msgstr "可设定属性:\n"
 
-#: ../programs/gvfs-info.c:348
+#: ../programs/gvfs-info.c:350
 #, c-format
 msgid "Writable attribute namespaces:\n"
 msgstr "可写的属性命名空间:\n"
 
-#: ../programs/gvfs-info.c:382 ../programs/gvfs-ls.c:409
-#: ../programs/gvfs-mkdir.c:55 ../programs/gvfs-monitor-dir.c:110
-#: ../programs/gvfs-monitor-file.c:109 ../programs/gvfs-mount.c:1041
-#: ../programs/gvfs-rename.c:62 ../programs/gvfs-set-attribute.c:137
-#: ../programs/gvfs-trash.c:90 ../programs/gvfs-tree.c:246
+#: ../programs/gvfs-info.c:384 ../programs/gvfs-ls.c:411
+#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-monitor-dir.c:113
+#: ../programs/gvfs-monitor-file.c:112 ../programs/gvfs-mount.c:1074
+#: ../programs/gvfs-rename.c:70 ../programs/gvfs-set-attribute.c:139
+#: ../programs/gvfs-trash.c:92 ../programs/gvfs-tree.c:249
 msgid "LOCATION"
 msgstr "位置"
 
-#: ../programs/gvfs-info.c:383
+#: ../programs/gvfs-info.c:385
 msgid "Show information about locations."
 msgstr "显示位置信息。"
 
-#: ../programs/gvfs-ls.c:41 ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:42 ../programs/gvfs-tree.c:37
 msgid "Show hidden files"
 msgstr "显示隐藏文件"
 
-#: ../programs/gvfs-ls.c:42
+#: ../programs/gvfs-ls.c:43
 msgid "Use a long listing format"
 msgstr "使用长列表格式"
 
-#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-ls.c:44
 msgid "Show completions"
 msgstr "显示完成"
 
-#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-ls.c:44
 msgid "PREFIX"
 msgstr "前缀"
 
-#: ../programs/gvfs-ls.c:45
+#: ../programs/gvfs-ls.c:46
 msgid "Print full URIs"
 msgstr "打印完整 URI"
 
-#: ../programs/gvfs-ls.c:180 ../programs/gvfs-ls.c:188
-#: ../programs/gvfs-rename.c:95
+#: ../programs/gvfs-ls.c:182 ../programs/gvfs-ls.c:190
+#: ../programs/gvfs-rename.c:110
 #, c-format
 msgid "Error: %s\n"
 msgstr "错误:%s\n"
 
-#: ../programs/gvfs-ls.c:410
+#: ../programs/gvfs-ls.c:412
 msgid "List the contents of the locations."
 msgstr "列出该位置的内容。"
 
-#: ../programs/gvfs-ls.c:411
+#: ../programs/gvfs-ls.c:413
 msgid ""
 "gvfs-ls is similar to the traditional ls utility, but using gvfs\n"
 "locations instead of local files: for example you can use something\n"
@@ -2677,197 +2724,197 @@ msgstr ""
 "作为位置。文件属性可由它们的 gvfs 名称指定,例如\n"
 "standard::icon。"
 
-#: ../programs/gvfs-mime.c:36
+#: ../programs/gvfs-mime.c:37
 msgid "Query handler for mime-type"
 msgstr "mime 类型的查询处理程序"
 
-#: ../programs/gvfs-mime.c:37
+#: ../programs/gvfs-mime.c:38
 msgid "Set handler for mime-type"
 msgstr "mime 类型的设置处理程序"
 
-#: ../programs/gvfs-mime.c:80
+#: ../programs/gvfs-mime.c:82
 msgid "MIMETYPE"
 msgstr "MIME 类型"
 
-#: ../programs/gvfs-mime.c:80
+#: ../programs/gvfs-mime.c:82
 msgid "HANDLER"
 msgstr "处理程序"
 
-#: ../programs/gvfs-mime.c:81
+#: ../programs/gvfs-mime.c:83
 msgid "Get or set the handler for a mime-type."
 msgstr "获取或设置 mime 类型的处理程序。"
 
-#: ../programs/gvfs-mime.c:93
+#: ../programs/gvfs-mime.c:95
 msgid "Specify either --query or --set"
 msgstr "指定 --query 或 --set"
 
-#: ../programs/gvfs-mime.c:104
+#: ../programs/gvfs-mime.c:112
 #, c-format
 msgid "Must specify a single mime-type.\n"
 msgstr "必须指定惟一的 mime 类型。\n"
 
-#: ../programs/gvfs-mime.c:111
+#: ../programs/gvfs-mime.c:119
 #, c-format
 msgid "Must specify the mime-type followed by the default handler.\n"
 msgstr "必须指定 mime 类型,跟上默认的处理程序。\n"
 
-#: ../programs/gvfs-mime.c:126
+#: ../programs/gvfs-mime.c:134
 #, c-format
 msgid "No default applications for '%s'\n"
 msgstr "没有对应“%s”的默认应用程序\n"
 
-#: ../programs/gvfs-mime.c:132
+#: ../programs/gvfs-mime.c:140
 #, c-format
 msgid "Default application for '%s': %s\n"
 msgstr "对应“%s”的默认应用程序:%s\n"
 
-#: ../programs/gvfs-mime.c:137
+#: ../programs/gvfs-mime.c:145
 #, c-format
 msgid "Registered applications:\n"
 msgstr "注册的应用程序:\n"
 
-#: ../programs/gvfs-mime.c:139
+#: ../programs/gvfs-mime.c:147
 #, c-format
 msgid "No registered applications\n"
 msgstr "没有注册的应用程序\n"
 
-#: ../programs/gvfs-mime.c:150
+#: ../programs/gvfs-mime.c:158
 #, c-format
 msgid "Recommended applications:\n"
 msgstr "推荐的应用程序:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:160
 #, c-format
 msgid "No recommended applications\n"
 msgstr "没有推荐的应用程序\n"
 
-#: ../programs/gvfs-mime.c:172
+#: ../programs/gvfs-mime.c:180
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "无法加载处理程序“%s”的信息\n"
 
-#: ../programs/gvfs-mime.c:178
+#: ../programs/gvfs-mime.c:186
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "无法将“%s”设为“%s”的默认处理程序:%s\n"
 
-#: ../programs/gvfs-mkdir.c:33
+#: ../programs/gvfs-mkdir.c:35
 msgid "Create parent directories"
 msgstr "创建父目录"
 
-#: ../programs/gvfs-mkdir.c:56
+#: ../programs/gvfs-mkdir.c:59
 msgid "Create directories."
 msgstr "创建目录。"
 
-#: ../programs/gvfs-mkdir.c:87 ../programs/gvfs-mkdir.c:96
+#: ../programs/gvfs-mkdir.c:96 ../programs/gvfs-mkdir.c:105
 #, c-format
 msgid "Error creating directory: %s\n"
 msgstr "创建目录出错:%s\n"
 
-#: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
+#: ../programs/gvfs-monitor-dir.c:40 ../programs/gvfs-monitor-file.c:40
 msgid "Don't send single MOVED events"
 msgstr "不发送单一的 MOVED 事件"
 
-#: ../programs/gvfs-monitor-dir.c:111
+#: ../programs/gvfs-monitor-dir.c:114
 msgid "Monitor directories for changes."
 msgstr "监视目录更改情况。"
 
-#: ../programs/gvfs-monitor-file.c:110
+#: ../programs/gvfs-monitor-file.c:113
 msgid "Monitor files for changes."
 msgstr "监视文件更改情况。"
 
-#: ../programs/gvfs-mount.c:57
+#: ../programs/gvfs-mount.c:59
 msgid "Mount as mountable"
 msgstr "挂载为可挂载"
 
-#: ../programs/gvfs-mount.c:58
+#: ../programs/gvfs-mount.c:60
 msgid "Mount volume with device file"
 msgstr "挂载卷连同设备文件"
 
-#: ../programs/gvfs-mount.c:58
+#: ../programs/gvfs-mount.c:60
 msgid "DEVICE"
 msgstr "设备"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:61
 msgid "Unmount"
 msgstr "卸载"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:62
 msgid "Eject"
 msgstr "弹出"
 
-#: ../programs/gvfs-mount.c:61
+#: ../programs/gvfs-mount.c:63
 msgid "Unmount all mounts with the given scheme"
 msgstr "卸载指定格式的所有挂载"
 
-#: ../programs/gvfs-mount.c:61
+#: ../programs/gvfs-mount.c:63
 msgid "SCHEME"
 msgstr "格式"
 
 #. Translator: List here is a verb as in 'List all mounts'
-#: ../programs/gvfs-mount.c:63
+#: ../programs/gvfs-mount.c:65
 msgid "List"
 msgstr "列表"
 
-#: ../programs/gvfs-mount.c:64
+#: ../programs/gvfs-mount.c:66
 msgid "Monitor events"
 msgstr "监视事件"
 
-#: ../programs/gvfs-mount.c:65
+#: ../programs/gvfs-mount.c:67
 msgid "Show extra information"
 msgstr "显示额外信息"
 
-#: ../programs/gvfs-mount.c:169 ../programs/gvfs-mount.c:193
+#: ../programs/gvfs-mount.c:201 ../programs/gvfs-mount.c:225
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "挂载位置出错:%s\n"
 
-#: ../programs/gvfs-mount.c:253
+#: ../programs/gvfs-mount.c:286
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "卸载挂载出错:%s\n"
 
-#: ../programs/gvfs-mount.c:276 ../programs/gvfs-mount.c:325
+#: ../programs/gvfs-mount.c:309 ../programs/gvfs-mount.c:358
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "查找封闭的挂载出错:%s\n"
 
-#: ../programs/gvfs-mount.c:302
+#: ../programs/gvfs-mount.c:335
 #, c-format
 msgid "Error ejecting mount: %s\n"
 msgstr "弹出挂载出错:%s\n"
 
-#: ../programs/gvfs-mount.c:781
+#: ../programs/gvfs-mount.c:814
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "挂载 %s 出错:%s\n"
 
-#: ../programs/gvfs-mount.c:796
+#: ../programs/gvfs-mount.c:829
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s 挂载在 %s\n"
 
-#: ../programs/gvfs-mount.c:846
+#: ../programs/gvfs-mount.c:879
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "没有设备文件 %s 的卷\n"
 
-#: ../programs/gvfs-mount.c:1042
+#: ../programs/gvfs-mount.c:1075
 msgid "Mount the locations."
 msgstr "挂载该位置。"
 
-#: ../programs/gvfs-move.c:108
+#: ../programs/gvfs-move.c:131
 msgid "Move one or more files from SOURCE to DEST."
 msgstr "移动 SOURCE 里的单个或多个文件至 DEST。"
 
-#: ../programs/gvfs-move.c:197
+#: ../programs/gvfs-move.c:228
 #, c-format
 msgid "Error moving file %s: %s\n"
 msgstr "移动文件 %s 出错:%s\n"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:62
+#: ../programs/gvfs-open.c:64
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
@@ -2877,146 +2924,153 @@ msgstr ""
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:118
+#: ../programs/gvfs-open.c:126
 #, c-format
 msgid "%s: %s: error opening location: %s\n"
 msgstr "%s: %s:打开位置出错:%s\n"
 
-#: ../programs/gvfs-rename.c:62
+#: ../programs/gvfs-rename.c:70
 msgid "NEW-NAME"
 msgstr "新名称"
 
-#: ../programs/gvfs-rename.c:63
+#: ../programs/gvfs-rename.c:71
 msgid "Rename a file."
 msgstr "重命名文件。"
 
-#: ../programs/gvfs-rename.c:102
+#: ../programs/gvfs-rename.c:117
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "重命名成功。新的 URI:%s\n"
 
-#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:68
+#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:69
 msgid "Ignore nonexistent files, never prompt"
 msgstr "忽略不存在的文件,从不提示"
 
-#: ../programs/gvfs-rm.c:57
+#: ../programs/gvfs-rm.c:59
 msgid "Delete the given files."
 msgstr "删除给出的文件。"
 
-#: ../programs/gvfs-save.c:44
+#: ../programs/gvfs-save.c:46
 msgid "Only create if not existing"
 msgstr "仅不存在时创建"
 
-#: ../programs/gvfs-save.c:45
+#: ../programs/gvfs-save.c:47
 msgid "Append to end of file"
 msgstr "追加到文件末尾"
 
-#: ../programs/gvfs-save.c:46
+#: ../programs/gvfs-save.c:48
 msgid "When creating, restrict access to the current user"
 msgstr "当创建文件时,限制对当前用户的访问"
 
+#: ../programs/gvfs-save.c:49
+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
-#: ../programs/gvfs-save.c:48
+#: ../programs/gvfs-save.c:51
 msgid "Print new etag at end"
 msgstr "在结束打印新的 etag"
 
 # 建议 etag 不翻译
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../programs/gvfs-save.c:50
+#: ../programs/gvfs-save.c:53
 msgid "The etag of the file being overwritten"
 msgstr "正在覆盖文件 etag"
 
-#: ../programs/gvfs-save.c:50
+#: ../programs/gvfs-save.c:53
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../programs/gvfs-save.c:78
+#: ../programs/gvfs-save.c:83
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "打开文件出错:%s\n"
 
-#: ../programs/gvfs-save.c:111
+#: ../programs/gvfs-save.c:116
 msgid "Error reading stdin"
 msgstr "读取 stdin(标准输入) 出错"
 
-#: ../programs/gvfs-save.c:124
+#: ../programs/gvfs-save.c:129
 #, c-format
 msgid "Error closing: %s\n"
 msgstr "关闭出错:%s\n"
 
 #. Translators: The "etag" is a token allowing to verify whether a file has been modified
-#: ../programs/gvfs-save.c:137
+#: ../programs/gvfs-save.c:142
 #, c-format
 msgid "Etag not available\n"
 msgstr "Etag 不可用\n"
 
-#: ../programs/gvfs-save.c:164
+#: ../programs/gvfs-save.c:169
 msgid "Read from standard input and save to DEST."
 msgstr "从标准输入中读取并保存至 DEST。"
 
-#: ../programs/gvfs-set-attribute.c:36
+#: ../programs/gvfs-set-attribute.c:37
 msgid "Type of the attribute"
 msgstr "属性类型"
 
-#: ../programs/gvfs-set-attribute.c:36
+#: ../programs/gvfs-set-attribute.c:37
 msgid "TYPE"
 msgstr "类型"
 
-#: ../programs/gvfs-set-attribute.c:137
+#: ../programs/gvfs-set-attribute.c:139
 msgid "ATTRIBUTE"
 msgstr "属性"
 
-#: ../programs/gvfs-set-attribute.c:137
+#: ../programs/gvfs-set-attribute.c:139
 msgid "VALUE"
 msgstr "值"
 
-#: ../programs/gvfs-set-attribute.c:138
+#: ../programs/gvfs-set-attribute.c:140
 msgid "Set a file attribute of LOCATION."
 msgstr "设置 LOCATION 的文件属性。"
 
-#: ../programs/gvfs-set-attribute.c:157
+#: ../programs/gvfs-set-attribute.c:165
 msgid "Location not specified\n"
 msgstr "位置未指定\n"
 
-#: ../programs/gvfs-set-attribute.c:165
+#: ../programs/gvfs-set-attribute.c:173
 msgid "Attribute not specified\n"
 msgstr "属性未指定\n"
 
-#: ../programs/gvfs-set-attribute.c:174
+#: ../programs/gvfs-set-attribute.c:182
 msgid "Value not specified\n"
 msgstr "未指定值\n"
 
-#: ../programs/gvfs-set-attribute.c:217
+#: ../programs/gvfs-set-attribute.c:225
 #, c-format
 msgid "Invalid attribute type %s\n"
 msgstr "无效的属性类型 %s\n"
 
-#: ../programs/gvfs-set-attribute.c:227
+#: ../programs/gvfs-set-attribute.c:235
 #, c-format
 msgid "Error setting attribute: %s\n"
 msgstr "设置属性出错:%s\n"
 
-#: ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-trash.c:70
 msgid "Empty the trash"
 msgstr "清空回收站"
 
-#: ../programs/gvfs-trash.c:91
+#: ../programs/gvfs-trash.c:93
 msgid "Move files or directories to the trash."
 msgstr "将文件或目录移到回收站。"
 
-#: ../programs/gvfs-trash.c:122
+#: ../programs/gvfs-trash.c:130
 #, c-format
 msgid "Error trashing file: %s\n"
 msgstr "移动文件到回收站出错:%s\n"
 
-#: ../programs/gvfs-tree.c:37
+#: ../programs/gvfs-tree.c:38
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "跟踪符号链接、挂载项和快捷方式"
 
-#: ../programs/gvfs-tree.c:247
+#: ../programs/gvfs-tree.c:250
 msgid "List contents of directories in a tree-like format."
 msgstr "以树形格式列举目录内容。"
 
+#~ msgid "progress"
+#~ msgstr "进度"
+
 #~ msgid "No storage volumes found"
 #~ msgstr "找不到存储卷"
 


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