[gvfs] Updated Traditional Chinese translation(Hong Kong and Taiwan)



commit 639afddbe72f6056ad30ca949af27067040af294
Author: Chao-Hsiung Liao <j_h_liau yahoo com tw>
Date:   Mon Aug 27 18:35:53 2012 +0800

    Updated Traditional Chinese translation(Hong Kong and Taiwan)

 po/zh_HK.po | 1326 +++++++++++++++++++++++-----------------------------------
 po/zh_TW.po | 1333 ++++++++++++++++++++++++-----------------------------------
 2 files changed, 1063 insertions(+), 1596 deletions(-)
---
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 9e9eeef..3185992 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gvfs 1.11.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 15:42+0800\n"
-"PO-Revision-Date: 2012-08-23 15:43+0800\n"
+"POT-Creation-Date: 2012-08-27 18:35+0800\n"
+"PO-Revision-Date: 2012-08-27 18:35+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (Hong Kong) <community linuxhall org>\n"
 "Language: \n"
@@ -17,19 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../client/gdaemonfile.c:416
-#: ../client/gdaemonfile.c:2767
+#: ../client/gdaemonfile.c:416 ../client/gdaemonfile.c:2767
 msgid "Operation not supported, files on different mounts"
 msgstr "ææåäåæèéïäææææä"
 
-#: ../client/gdaemonfile.c:1034
-#: ../client/gdaemonfile.c:3110
+#: ../client/gdaemonfile.c:1034 ../client/gdaemonfile.c:3110
 #: ../client/gvfsiconloadable.c:304
 msgid "Couldn't get stream file descriptor"
 msgstr "çæååäææææææèå"
 
-#: ../client/gdaemonfile.c:1163
-#: ../client/gdaemonfile.c:1235
+#: ../client/gdaemonfile.c:1163 ../client/gdaemonfile.c:1235
 #: ../client/gvfsiconloadable.c:129
 msgid "Didn't get stream file descriptor"
 msgstr "äèååäææææææèå"
@@ -50,20 +47,17 @@ msgstr "æäåæåæèé"
 msgid "Invalid filename %s"
 msgstr "çæçææåç %s"
 
-#: ../client/gdaemonfile.c:2609
-#: ../client/gdaemonvfs.c:1286
+#: ../client/gdaemonfile.c:2609 ../client/gdaemonvfs.c:1286
 #: ../client/gdaemonvfs.c:1338
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "èåææäçèææççéèï%s"
 
-#: ../client/gdaemonfile.c:2610
-#: ../client/gdaemonvfs.c:1339
+#: ../client/gdaemonfile.c:2610 ../client/gdaemonvfs.c:1339
 msgid "values must be string or list of strings"
 msgstr "æååéçåäæåäçæå"
 
-#: ../client/gdaemonfileenumerator.c:529
-#: ../client/gdaemonfileenumerator.c:612
+#: ../client/gdaemonfileenumerator.c:529 ../client/gdaemonfileenumerator.c:612
 #: ../client/gdaemonfileenumerator.c:663
 #: ../client/gdaemonfileinputstream.c:630
 #: ../client/gdaemonfileinputstream.c:783
@@ -73,38 +67,22 @@ msgstr "æååéçåäæåäçæå"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052
-#: ../client/gvfsdaemondbus.c:726
-#: ../daemon/gvfsbackendobexftp.c:1085
-#: ../daemon/gvfsbackendobexftp.c:1106
-#: ../daemon/gvfsbackendobexftp.c:1225
-#: ../daemon/gvfsbackendobexftp.c:1362
-#: ../daemon/gvfsbackendobexftp.c:1426
-#: ../daemon/gvfsbackendobexftp.c:1628
-#: ../daemon/gvfsbackendobexftp.c:1735
-#: ../daemon/gvfsbackendobexftp.c:1897
-#: ../daemon/gvfsbackendobexftp.c:1924
-#: ../daemon/gvfsbackendobexftp.c:1983
-#: ../daemon/gvfsbackendobexftp.c:2005
-#: ../daemon/gvfsbackendobexftp.c:2068
-#: ../daemon/gvfsbackendobexftp.c:2087
-#: ../daemon/gvfsbackendsmb.c:1179
-#: ../daemon/gvfsbackendtest.c:91
-#: ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187
-#: ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202
-#: ../monitor/gdu/ggdumount.c:1070
-#: ../monitor/proxy/gproxydrive.c:522
-#: ../monitor/proxy/gproxydrive.c:610
-#: ../monitor/proxy/gproxydrive.c:760
-#: ../monitor/proxy/gproxydrive.c:898
-#: ../monitor/proxy/gproxydrive.c:936
-#: ../monitor/proxy/gproxydrive.c:1061
-#: ../monitor/proxy/gproxymount.c:475
-#: ../monitor/proxy/gproxymount.c:560
-#: ../monitor/proxy/gproxyvolume.c:829
-#: ../monitor/proxy/gproxyvolume.c:892
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:726
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
+#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070
+#: ../monitor/proxy/gproxydrive.c:522 ../monitor/proxy/gproxydrive.c:610
+#: ../monitor/proxy/gproxydrive.c:760 ../monitor/proxy/gproxydrive.c:898
+#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1061
+#: ../monitor/proxy/gproxymount.c:475 ../monitor/proxy/gproxymount.c:560
+#: ../monitor/proxy/gproxyvolume.c:829 ../monitor/proxy/gproxyvolume.c:892
 msgid "Operation was cancelled"
 msgstr "æäåèåæ"
 
@@ -169,7 +147,9 @@ msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéè"
 #.
 #: ../common/gvfsdnssdresolver.c:1126
 #, c-format
-msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
+msgid ""
+"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
+"records are missing. Keys required: \"%s\"."
 msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéèãäæåå TXT çééåãéèèåéïã%4$sã"
 
 #. Translators:
@@ -182,8 +162,7 @@ msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéèã
 msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
 msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãéæ"
 
-#: ../common/gvfsdnssdutils.c:233
-#: ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
 #: ../common/gvfsdnssdutils.c:280
 #, c-format
 msgid "Malformed dns-sd encoded_triple '%s'"
@@ -205,33 +184,29 @@ msgstr "GVfsIcon çèåèææåäè"
 msgid "%s File System Service"
 msgstr "%s ææççæå"
 
-#: ../daemon/daemon-main.c:176
-#: ../daemon/daemon-main.c:306
-#: ../programs/gvfs-copy.c:90
-#: ../programs/gvfs-move.c:78
-#: ../programs/gvfs-rename.c:36
+#: ../daemon/daemon-main.c:178 ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
 #: ../programs/gvfs-set-attribute.c:105
 #, c-format
 msgid "Error: %s"
 msgstr "éèï%s"
 
-#: ../daemon/daemon-main.c:233
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "çæï%s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:257
-#: ../daemon/daemon-main.c:275
+#: ../daemon/daemon-main.c:260 ../daemon/daemon-main.c:278
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "çæï %s key=value key=value â"
 
-#: ../daemon/daemon-main.c:273
+#: ../daemon/daemon-main.c:276
 #, c-format
 msgid "No mount type specified"
 msgstr "ææåæèéå"
 
-#: ../daemon/daemon-main.c:305
+#: ../daemon/daemon-main.c:308
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s çæèéååäçä"
@@ -256,118 +231,101 @@ msgstr "éçæéæçäæ"
 msgid "Got EOS"
 msgstr "åå EOS"
 
-#: ../daemon/gvfsafpserver.c:198
-#: ../daemon/gvfsafpserver.c:477
-#, c-format
-msgid "Server doesn't support passwords longer than %d characters"
-msgstr "äæåäææéåèé %d åççåç"
-
-#: ../daemon/gvfsafpserver.c:222
-#: ../daemon/gvfsafpserver.c:528
-msgid "An invalid username was provided"
-msgstr "èåäçæçäçèåç"
-
-#: ../daemon/gvfsafpserver.c:391
-#: ../daemon/gvfsafpserver.c:618
-#, c-format
-msgid "AFP server %s declined the submitted password"
-msgstr "AFP äæå %s æçäéåçåç"
-
-#: ../daemon/gvfsafpserver.c:426
-#: ../daemon/gvfsafpserver.c:645
-#: ../daemon/gvfsafpserver.c:818
-#: ../daemon/gvfsafpserver.c:864
-#: ../daemon/gvfsafpserver.c:978
-#: ../daemon/gvfsafpserver.c:1352
-#: ../daemon/gvfsafpserver.c:1654
-#: ../daemon/gvfsafpserver.c:1743
-#, c-format
-msgid "Received invalid reply from server"
-msgstr "åäæåååçæçåè"
-
-#: ../daemon/gvfsafpserver.c:670
-#: ../daemon/gvfsafpserver.c:695
-#, c-format
-msgid "AFP server %s doesn't support anonymous login"
-msgstr "AFP äæå %s äææååçå"
-
-#: ../daemon/gvfsafpserver.c:723
-#, c-format
-msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
-msgstr "çå AFP äæå %s åæ (æäååéçéèæå)"
-
-#: ../daemon/gvfsafpserver.c:797
-#: ../daemon/gvfsafpserver.c:818
-#, c-format
-msgid "Failed to connect to server (%s)"
-msgstr "çæéçèäæå (%s)"
-
-#: ../daemon/gvfsafpserver.c:797
-msgid "Server doesn't support AFP version 3.0 or later"
-msgstr "äæåäææ AFP ç 3.0 çäåççæ"
-
-#: ../daemon/gvfsafpserver.c:903
-#: ../daemon/gvfsafpvolume.c:390
-#: ../daemon/gvfsafpvolume.c:668
-#: ../daemon/gvfsafpvolume.c:821
-#: ../daemon/gvfsafpvolume.c:1015
-#: ../daemon/gvfsafpvolume.c:1215
-#: ../daemon/gvfsafpvolume.c:1398
-#: ../daemon/gvfsafpvolume.c:1555
-#: ../daemon/gvfsafpvolume.c:2001
-#: ../daemon/gvfsafpvolume.c:2127
-#: ../daemon/gvfsafpvolume.c:2289
-#: ../daemon/gvfsafpvolume.c:2509
-#: ../daemon/gvfsbackendafc.c:286
-#: ../daemon/gvfsbackendsftp.c:311
-#: ../daemon/gvfsbackendsftp.c:1833
-#: ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
-msgid "Permission denied"
-msgstr "æéäè"
+msgid "The server doesn't support passwords longer than %d character."
+msgid_plural "The server doesn't support passwords longer than %d characters."
+msgstr[0] "äæåäææéåèé %d åççåçã"
 
-#: ../daemon/gvfsafpserver.c:908
+#: ../daemon/gvfsafpserver.c:224 ../daemon/gvfsafpserver.c:533
+msgid "An invalid username was provided."
+msgstr "èåäçæçäçèåçã"
+
+#: ../daemon/gvfsafpserver.c:393
 #, c-format
-msgid "Command is not supported by server"
-msgstr "äæåäæææä"
+msgid "Unable to login to the server â%sâ with the given password."
+msgstr "çæäæåçåççåäæåâ%sâã"
 
-#: ../daemon/gvfsafpserver.c:912
+#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650
+#: ../daemon/gvfsafpserver.c:825 ../daemon/gvfsafpserver.c:873
+#: ../daemon/gvfsafpserver.c:989
 #, c-format
-msgid "User's password has expired"
-msgstr "äçèçåçåéæ"
+msgid "Unable to connect to the server â%sâ. A communication problem occurred."
+msgstr "çæéçåäæåâ%sâãççéèåéã"
 
-#: ../daemon/gvfsafpserver.c:916
+#: ../daemon/gvfsafpserver.c:623
 #, c-format
-msgid "User's password needs to be changed"
-msgstr "äçèçåçéèææ"
+msgid "Unable to connect to the server â%sâ with the given password."
+msgstr "çæäæåçåçéçåäæåâ%sâã"
 
-#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsafpserver.c:1058
+#: ../daemon/gvfsafpserver.c:676 ../daemon/gvfsafpserver.c:701
+#, c-format
+msgid "The server â%sâ doesn't support anonymous access."
+msgstr "äæåâ%sâäææååçåã"
+
+#: ../daemon/gvfsafpserver.c:729
+#, c-format
+msgid ""
+"Unable to connect to the server â%sâ. No suitable authentication mechanism "
+"was found."
+msgstr "çæéçåäæåâ%sâãæäååéçéèæåã"
+
+#: ../daemon/gvfsafpserver.c:803
+#, 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
 #, c-format
-msgid "Enter password for afp as %s on %s"
-msgstr "èå %s å %s äç afp åç "
+msgid "Permission denied."
+msgstr "æéèæçã"
+
+#: ../daemon/gvfsafpserver.c:919
+#, c-format
+msgid "The command is not supported by the server."
+msgstr "äæåäæææäã"
+
+#: ../daemon/gvfsafpserver.c:923
+#, c-format
+msgid "Your password has expired."
+msgstr "äçåçåéæã"
+
+#: ../daemon/gvfsafpserver.c:927
+#, c-format
+msgid "Your password needs to be changed."
+msgstr "äçåçéèææã"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:1061
+#: ../daemon/gvfsafpserver.c:1070
 #, c-format
-msgid "Enter password for afp on %s"
-msgstr "èå %s ç afp åç "
+msgid "Enter your password for the server â%sâ."
+msgstr "èååäæåâ%sâäçåçã"
 
-#: ../daemon/gvfsafpserver.c:1093
-#: ../daemon/gvfsbackendftp.c:518
-#: ../daemon/gvfsbackendsftp.c:984
-#: ../daemon/gvfsbackendsmbbrowse.c:995
-#: ../daemon/gvfsbackendsmb.c:619
-msgid "Password dialog cancelled"
-msgstr "åçåèçåèåæ"
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:1073
+#, c-format
+msgid "Enter your name and password for the server â%sâ."
+msgstr "èåäåäæåâ%sâäçåçèåçã"
 
-#: ../daemon/gvfsafpserver.c:1210
-msgid "Failed to logout from server"
-msgstr "çæåäæåçå"
+#: ../daemon/gvfsafpserver.c:1105
+msgid "The password prompt was cancelled."
+msgstr "åçæçååæã"
 
-#: ../daemon/gvfsafpserver.c:1699
-msgid "ID not found"
-msgstr "æäå ID"
+#: ../daemon/gvfsafpserver.c:1222
+msgid "Unable to disconnect from the server."
+msgstr "çæåäæåæçã"
+
+#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1666
+#: ../daemon/gvfsafpserver.c:1757
+#, c-format
+msgid "Unable to connect to the server. A communication problem occurred."
+msgstr "çæéçåäæåãççéèåéã"
+
+#: ../daemon/gvfsafpserver.c:1713
+msgid "Identification not found."
+msgstr "æäåèåèèã"
 
 #: ../daemon/gvfsafputils.c:124
 #, c-format
@@ -384,42 +342,37 @@ msgstr "ååäæçéèäç %d äèäæå"
 msgid "Couldn't mount AFP volume %s on %s"
 msgstr "çæå AFP ååå %s æèå %s"
 
-#: ../daemon/gvfsafpvolume.c:394
-#: ../daemon/gvfsafpvolume.c:1721
-#: ../daemon/gvfsafpvolume.c:2513
-#: ../daemon/gvfsbackendafc.c:968
-#: ../daemon/gvfsbackendafpbrowse.c:190
-#: ../daemon/gvfsbackendafpbrowse.c:323
-#: ../daemon/gvfsbackendafpbrowse.c:355
-#: ../daemon/gvfsbackendarchive.c:647
-#: ../daemon/gvfsbackendarchive.c:695
-#: ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776
-#: ../daemon/gvfsbackendcdda.c:1011
-#: ../daemon/gvfsbackendcomputer.c:627
-#: ../daemon/gvfsbackenddnssd.c:398
-#: ../daemon/gvfsbackendftp.c:1067
-#: ../daemon/gvfsbackendnetwork.c:602
-#: ../daemon/gvfsbackendsmbbrowse.c:1094
-#: ../daemon/gvfsbackendsmbbrowse.c:1161
-#: ../daemon/gvfsbackendsmbbrowse.c:1333
-#: ../daemon/gvfsbackendsmbbrowse.c:1403
+#: ../daemon/gvfsafpvolume.c:390 ../daemon/gvfsafpvolume.c:668
+#: ../daemon/gvfsafpvolume.c:821 ../daemon/gvfsafpvolume.c:1015
+#: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsafpvolume.c:1398
+#: ../daemon/gvfsafpvolume.c:1555 ../daemon/gvfsafpvolume.c:2001
+#: ../daemon/gvfsafpvolume.c:2127 ../daemon/gvfsafpvolume.c:2289
+#: ../daemon/gvfsafpvolume.c:2509 ../daemon/gvfsbackendafc.c:286
+#: ../daemon/gvfsbackendsftp.c:311 ../daemon/gvfsbackendsftp.c:1834
+#: ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "æéäè"
+
+#: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721
+#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:974
+#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:323
+#: ../daemon/gvfsbackendafpbrowse.c:355 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:1011
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:678
+#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
+#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "ææäåå"
 
-#: ../daemon/gvfsafpvolume.c:398
-#: ../daemon/gvfsafpvolume.c:468
-#: ../daemon/gvfsafpvolume.c:2517
-#: ../daemon/gvfsbackendafp.c:277
-#: ../daemon/gvfsbackendafp.c:478
-#: ../daemon/gvfsbackendafp.c:1310
-#: ../daemon/gvfsbackenddav.c:2241
-#: ../daemon/gvfsbackendftp.c:773
-#: ../daemon/gvfsbackendsftp.c:2332
-#: ../daemon/gvfsbackendsftp.c:3068
-#: ../daemon/gvfsbackendsftp.c:3407
-#: ../daemon/gvfsbackendsftp.c:4275
+#: ../daemon/gvfsafpvolume.c:398 ../daemon/gvfsafpvolume.c:468
+#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafp.c:277
+#: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1310
+#: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
 msgid "File is directory"
 msgstr "æææçé"
 
@@ -427,15 +380,12 @@ msgstr "æææçé"
 msgid "Too many files open"
 msgstr "éåäååææ"
 
-#: ../daemon/gvfsafpvolume.c:672
-#: ../daemon/gvfsafpvolume.c:829
+#: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:829
 msgid "Target file is open"
 msgstr "çæææåéå"
 
-#: ../daemon/gvfsafpvolume.c:676
-#: ../daemon/gvfsbackendburn.c:420
-#: ../daemon/gvfsbackenddav.c:2590
-#: ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:420
+#: ../daemon/gvfsbackenddav.c:2590 ../daemon/gvfsbackendsftp.c:1828
 msgid "Directory not empty"
 msgstr "çéäæçç"
 
@@ -443,47 +393,34 @@ msgstr "çéäæçç"
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "çæçäèæèçäèåé (æååé)"
 
-#: ../daemon/gvfsafpvolume.c:684
-#: ../daemon/gvfsafpvolume.c:1231
+#: ../daemon/gvfsafpvolume.c:684 ../daemon/gvfsafpvolume.c:1231
 #: ../daemon/gvfsafpvolume.c:2131
 msgid "Target object doesn't exist"
 msgstr "çæçääåå"
 
-#: ../daemon/gvfsafpvolume.c:688
-#: ../daemon/gvfsafpvolume.c:841
-#: ../daemon/gvfsafpvolume.c:1035
-#: ../daemon/gvfsafpvolume.c:1235
+#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:841
+#: ../daemon/gvfsafpvolume.c:1035 ../daemon/gvfsafpvolume.c:1235
 #: ../daemon/gvfsafpvolume.c:2135
 msgid "Volume is read-only"
 msgstr "åååæåè"
 
-#: ../daemon/gvfsafpvolume.c:825
-#: ../daemon/gvfsafpvolume.c:1019
-#: ../daemon/gvfsafpvolume.c:1567
-#: ../daemon/gvfsafpvolume.c:2005
+#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019
+#: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsafpvolume.c:2005
 #: ../daemon/gvfsafpvolume.c:2647
 msgid "Not enough space on volume"
 msgstr "åååäææèåççé"
 
-#: ../daemon/gvfsafpvolume.c:833
-#: ../daemon/gvfsafpvolume.c:1414
-#: ../daemon/gvfsafpvolume.c:1571
-#: ../daemon/gvfsbackendafp.c:284
-#: ../daemon/gvfsbackendafp.c:485
-#: ../daemon/gvfsbackenddav.c:2297
-#: ../daemon/gvfsbackenddav.c:2550
-#: ../daemon/gvfsbackenddav.c:2661
-#: ../daemon/gvfsbackendftp.c:752
-#: ../daemon/gvfsbackendftp.c:933
-#: ../daemon/gvfsbackendftp.c:1372
-#: ../daemon/gvfsbackendftp.c:1552
-#: ../daemon/gvfsbackendsftp.c:4284
-#: ../daemon/gvfsbackendsmb.c:2082
+#: ../daemon/gvfsafpvolume.c:833 ../daemon/gvfsafpvolume.c:1414
+#: ../daemon/gvfsafpvolume.c:1571 ../daemon/gvfsbackendafp.c:284
+#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2297
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackenddav.c:2661
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
 msgid "Target file already exists"
 msgstr "çæææååå"
 
-#: ../daemon/gvfsafpvolume.c:837
-#: ../daemon/gvfsafpvolume.c:1027
+#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1027
 msgid "Ancestor directory doesn't exist"
 msgstr "äåçéäåå"
 
@@ -495,8 +432,7 @@ msgstr "åååæåååääææçé"
 msgid "Target directory already exists"
 msgstr "çæçéååå"
 
-#: ../daemon/gvfsafpvolume.c:1219
-#: ../daemon/gvfsbackendafp.c:590
+#: ../daemon/gvfsafpvolume.c:1219 ../daemon/gvfsbackendafp.c:590
 msgid "Can't rename volume"
 msgstr "äèéæååååå"
 
@@ -572,8 +508,7 @@ msgstr "ææäæäèåæééå"
 msgid "Internal Apple File Control error"
 msgstr "åéç Apple æææååéè"
 
-#: ../daemon/gvfsbackendafc.c:213
-#: ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "ææäåå"
 
@@ -624,7 +559,9 @@ msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice éèïçæçåæ"
 
 #: ../daemon/gvfsbackendafc.c:314
-msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly."
+msgid ""
+"libimobiledevice Error: No device found. Make sure usbmuxd is set up "
+"correctly."
 msgstr "libimobiledevice éèïæäåèçãèçå usbmuxd åæçèåã"
 
 #: ../daemon/gvfsbackendafc.c:318
@@ -632,46 +569,39 @@ msgstr "libimobiledevice éèïæäåèçãèçå usbmuxd åæç
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "æèçç libimobiledevice éè (%d)"
 
-#: ../daemon/gvfsbackendafc.c:410
+#: ../daemon/gvfsbackendafc.c:416
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../daemon/gvfsbackendafc.c:410
-#: ../daemon/gvfsbackend.c:939
-#: ../monitor/gdu/ggdudrive.c:1024
-#: ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackendafc.c:416 ../daemon/gvfsbackend.c:939
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:736
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../daemon/gvfsbackendafc.c:428
-#: ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579
-#: ../daemon/gvfsbackenddav.c:1820
-#: ../daemon/gvfsbackendhttp.c:309
-#: ../daemon/gvfsbackendobexftp.c:862
-#: ../daemon/gvfsbackendobexftp.c:878
-#: ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendafc.c:434 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1820
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "çæçæèèæ"
 
-#: ../daemon/gvfsbackendafc.c:434
-#: ../daemon/gvfsbackendafc.c:464
+#: ../daemon/gvfsbackendafc.c:440 ../daemon/gvfsbackendafc.c:470
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "çæç AFC äçïåéç afc://uuid:port-number æå"
 
-#: ../daemon/gvfsbackendafc.c:450
+#: ../daemon/gvfsbackendafc.c:456
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple Mobile Device"
 
-#: ../daemon/gvfsbackendafc.c:455
+#: ../daemon/gvfsbackendafc.c:461
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Apple Mobile Device, åèç"
 
-#: ../daemon/gvfsbackendafc.c:460
+#: ../daemon/gvfsbackendafc.c:466
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple Mobile Device äçæä"
@@ -679,7 +609,7 @@ msgstr "Apple Mobile Device äçæä"
 #. translators:
 #. * This is the device name, with the service being browsed in brackets, eg.:
 #. * Alan Smithee's iPhone (jailbreak)
-#: ../daemon/gvfsbackendafc.c:519
+#: ../daemon/gvfsbackendafc.c:525
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (èç)"
@@ -687,8 +617,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:526
-#: ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:532 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "%s äçæä"
@@ -696,45 +625,37 @@ 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:618
-#, c-format
-msgid "The device '%s' is locked. Enter the passcode on the device and click 'Try again'."
-msgstr "èçã%sãåéåãèèåèççåçåæäãåèäæãã"
-
-#: ../daemon/gvfsbackendafc.c:958
-#: ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645
-#: ../daemon/gvfsbackendgphoto2.c:1810
-#: ../daemon/gvfsbackendobexftp.c:1071
-#: ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:718
-#: ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:624
+#, c-format
+msgid ""
+"The device â%sâ is locked. Enter the passcode on the device and click âTry "
+"againâ."
+msgstr "èçâ%sâåéåãèèåèççåçåæäâåèäæâã"
+
+#: ../daemon/gvfsbackendafc.c:964 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1810
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendrecent.c:121
+#: ../daemon/gvfsbackendsmb.c:718 ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "äèéåçé"
 
-#: ../daemon/gvfsbackendafc.c:1159
-#: ../daemon/gvfsbackendafc.c:2502
+#: ../daemon/gvfsbackendafc.c:1165 ../daemon/gvfsbackendafc.c:2508
 msgid "Backups are not yet supported."
 msgstr "åæææåäã"
 
-#: ../daemon/gvfsbackendafc.c:1331
+#: ../daemon/gvfsbackendafc.c:1337
 msgid "Invalid seek type"
 msgstr "çæçæåéå"
 
-#: ../daemon/gvfsbackendafc.c:2339
-#: ../daemon/gvfsbackendafp.c:1749
-#: ../daemon/gvfsbackendftp.c:1087
-#: ../daemon/gvfsbackendftp.c:1135
-#: ../daemon/gvfsbackendftp.c:1156
-#: ../daemon/gvfsbackendsftp.c:1831
-#: ../daemon/gvfsbackendsftp.c:4632
-#: ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsbackendafc.c:2345 ../daemon/gvfsbackendafp.c:1749
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
 #: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "æääèææ"
 
-#: ../daemon/gvfsbackendafpbrowse.c:218
-#: ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1089
 #: ../daemon/gvfsbackendsmbbrowse.c:1135
 msgid "The file is not a mountable"
 msgstr "èæææçææèç"
@@ -751,41 +672,32 @@ msgstr "AFP ååå %s æ %s"
 msgid "AFP volumes on %s"
 msgstr "AFP åååæ %s"
 
-#: ../daemon/gvfsbackendafpbrowse.c:489
-#: ../daemon/gvfsbackendafp.c:2097
-#: ../daemon/gvfsbackendarchive.c:539
-#: ../daemon/gvfsbackendftp.c:667
-#: ../daemon/gvfsbackendsftp.c:1744
+#: ../daemon/gvfsbackendafpbrowse.c:489 ../daemon/gvfsbackendafp.c:2097
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
 msgid "No hostname specified"
 msgstr "ææåäæåç"
 
-#: ../daemon/gvfsbackendafpbrowse.c:559
-#: ../daemon/gvfsbackendafp.c:2188
+#: ../daemon/gvfsbackendafpbrowse.c:559 ../daemon/gvfsbackendafp.c:2188
 msgid "Apple Filing Protocol Service"
 msgstr "Apple Filing Protocol Service"
 
-#: ../daemon/gvfsbackendafp.c:274
-#: ../daemon/gvfsbackendburn.c:871
-#: ../daemon/gvfsbackendftp.c:1544
-#: ../daemon/gvfsbackendobexftp.c:1779
+#: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:871
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
 msgid "Can't copy directory over directory"
 msgstr "äèåçéèèåçéä"
 
-#: ../daemon/gvfsbackendafp.c:293
-#: ../daemon/gvfsbackendburn.c:887
-#: ../daemon/gvfsbackendftp.c:1567
-#: ../daemon/gvfsbackendobexftp.c:1794
+#: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:887
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
 msgid "Can't recursively copy directory"
 msgstr "äèéåèèçé"
 
-#: ../daemon/gvfsbackendafp.c:475
-#: ../daemon/gvfsbackendsftp.c:4270
+#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4271
 #: ../daemon/gvfsbackendsmb.c:2071
 msgid "Can't move directory over directory"
 msgstr "äèåçéçåèçéä"
 
-#: ../daemon/gvfsbackendafp.c:1229
-#: ../daemon/gvfsbackendafp.c:1328
+#: ../daemon/gvfsbackendafp.c:1229 ../daemon/gvfsbackendafp.c:1328
 msgid "backups not supported"
 msgstr "äææåä"
 
@@ -794,16 +706,13 @@ msgstr "äææåä"
 msgid "Unable to create temporary file (%s)"
 msgstr "çæåçæåæ (%s)"
 
-#: ../daemon/gvfsbackendafp.c:1317
-#: ../daemon/gvfsbackenddav.c:2370
-#: ../daemon/gvfsbackendsftp.c:3420
-#: ../daemon/gvfsbackendsmb.c:1148
+#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2370
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
 msgid "The file was externally modified"
 msgstr "èææåèåéçåäæé"
 
-#: ../daemon/gvfsbackendafp.c:1733
-#: ../daemon/gvfsbackendftp.c:1128
-#: ../daemon/gvfsbackendsftp.c:4642
+#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "çæçåæéå (éæç unit32)"
 
@@ -826,21 +735,16 @@ 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:330
-#: ../daemon/gvfsbackendsftp.c:2268
+#: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ æ %s"
 
-#: ../daemon/gvfsbackendarchive.c:785
-#: ../daemon/gvfsbackendburn.c:675
-#: ../daemon/gvfsbackendcomputer.c:715
-#: ../daemon/gvfsbackenddnssd.c:445
-#: ../daemon/gvfsbackendftp.c:351
-#: ../daemon/gvfsbackendnetwork.c:648
-#: ../daemon/gvfsbackendsftp.c:3880
-#: ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:675
+#: ../daemon/gvfsbackendcomputer.c:715 ../daemon/gvfsbackenddnssd.c:445
+#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:724
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "èææäæçé"
 
@@ -853,32 +757,21 @@ msgstr "çé"
 msgid "Unable to create temporary directory"
 msgstr "çæåçæåçé"
 
-#: ../daemon/gvfsbackendburn.c:400
-#: ../daemon/gvfsbackendburn.c:411
-#: ../daemon/gvfsbackendburn.c:446
-#: ../daemon/gvfsbackendburn.c:667
-#: ../daemon/gvfsbackendburn.c:712
-#: ../daemon/gvfsbackendburn.c:738
-#: ../daemon/gvfsbackendburn.c:776
-#: ../daemon/gvfsbackendburn.c:967
-#: ../daemon/gvfsbackendburn.c:1003
-#: ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1205
-#: ../daemon/gvfsbackendgphoto2.c:2131
-#: ../daemon/gvfsbackendgphoto2.c:2854
-#: ../daemon/gvfsbackendrecent.c:105
-#: ../daemon/gvfsbackendrecent.c:259
-#: ../daemon/gvfsbackendsftp.c:1835
-#: ../daemon/gvfsbackendsftp.c:2948
-#: ../daemon/gvfsbackendsftp.c:2961
-#: ../daemon/gvfsbackendsftp.c:2981
-#: ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:400 ../daemon/gvfsbackendburn.c:411
+#: ../daemon/gvfsbackendburn.c:446 ../daemon/gvfsbackendburn.c:667
+#: ../daemon/gvfsbackendburn.c:712 ../daemon/gvfsbackendburn.c:738
+#: ../daemon/gvfsbackendburn.c:776 ../daemon/gvfsbackendburn.c:967
+#: ../daemon/gvfsbackendburn.c:1003 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1205 ../daemon/gvfsbackendgphoto2.c:2131
+#: ../daemon/gvfsbackendgphoto2.c:2854 ../daemon/gvfsbackendrecent.c:105
+#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
+#: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "ææéåæææçé"
 
-#: ../daemon/gvfsbackendburn.c:454
-#: ../daemon/gvfsbackendburn.c:899
+#: ../daemon/gvfsbackendburn.c:454 ../daemon/gvfsbackendburn.c:899
 #: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "äèåææèèåçéä"
@@ -888,58 +781,34 @@ msgstr "äèåææèèåçéä"
 msgid "CD/DVD Creator"
 msgstr "CD/DVD èäçå"
 
-#: ../daemon/gvfsbackendburn.c:748
-#: ../daemon/gvfsbackendburn.c:784
-#: ../daemon/gvfsbackendburn.c:919
-#: ../daemon/gvfsbackendburn.c:981
-#: ../daemon/gvfsbackendburn.c:985
-#: ../daemon/gvfsbackendburn.c:995
+#: ../daemon/gvfsbackendburn.c:748 ../daemon/gvfsbackendburn.c:784
+#: ../daemon/gvfsbackendburn.c:919 ../daemon/gvfsbackendburn.c:981
+#: ../daemon/gvfsbackendburn.c:985 ../daemon/gvfsbackendburn.c:995
 #: ../daemon/gvfsbackendgphoto2.c:2928
 msgid "File exists"
 msgstr "ææååå"
 
-#: ../daemon/gvfsbackendburn.c:823
-#: ../daemon/gvfsjobcloseread.c:112
-#: ../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:266
-#: ../daemon/gvfsjobmakedirectory.c:108
-#: ../daemon/gvfsjobmount.c:112
-#: ../daemon/gvfsjobmountmountable.c:138
-#: ../daemon/gvfsjobmove.c:121
-#: ../daemon/gvfsjobopenforread.c:120
-#: ../daemon/gvfsjobopenforwrite.c:132
-#: ../daemon/gvfsjobopenforwrite.c:146
-#: ../daemon/gvfsjobopenforwrite.c:160
-#: ../daemon/gvfsjobopeniconforread.c:104
-#: ../daemon/gvfsjobpollmountable.c:107
-#: ../daemon/gvfsjobpull.c:125
-#: ../daemon/gvfsjobpush.c:125
-#: ../daemon/gvfsjobqueryattributes.c:145
-#: ../daemon/gvfsjobqueryfsinfo.c:116
-#: ../daemon/gvfsjobqueryinfo.c:124
-#: ../daemon/gvfsjobqueryinforead.c:119
-#: ../daemon/gvfsjobqueryinfowrite.c:119
-#: ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119
-#: ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:130
-#: ../daemon/gvfsjobsetdisplayname.c:111
-#: ../daemon/gvfsjobstartmountable.c:113
-#: ../daemon/gvfsjobstopmountable.c:115
-#: ../daemon/gvfsjobtrash.c:107
-#: ../daemon/gvfsjobunmountmountable.c:157
-#: ../daemon/gvfsjobunmountmountable.c:172
-#: ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1174
-#: ../monitor/gdu/ggdumount.c:1258
-#: ../monitor/gdu/ggduvolume.c:1617
-#: ../monitor/udisks2/gvfsudisks2mount.c:1108
+#: ../daemon/gvfsbackendburn.c:823 ../daemon/gvfsjobcloseread.c:112
+#: ../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:268
+#: ../daemon/gvfsjobmakedirectory.c:108 ../daemon/gvfsjobmount.c:112
+#: ../daemon/gvfsjobmountmountable.c:138 ../daemon/gvfsjobmove.c:121
+#: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:132
+#: ../daemon/gvfsjobopenforwrite.c:146 ../daemon/gvfsjobopenforwrite.c:160
+#: ../daemon/gvfsjobopeniconforread.c:104 ../daemon/gvfsjobpollmountable.c:107
+#: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125
+#: ../daemon/gvfsjobqueryattributes.c:145 ../daemon/gvfsjobqueryfsinfo.c:116
+#: ../daemon/gvfsjobqueryinfo.c:124 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
+#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobsetattribute.c:130 ../daemon/gvfsjobsetdisplayname.c:111
+#: ../daemon/gvfsjobstartmountable.c:113 ../daemon/gvfsjobstopmountable.c:115
+#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobunmountmountable.c:157
+#: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258
+#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1108
 #: ../monitor/udisks2/gvfsudisks2volume.c:1566
 msgid "Operation not supported by backend"
 msgstr "åçäææææä"
@@ -948,31 +817,24 @@ msgstr "åçäææææä"
 msgid "No such file or directory in target path"
 msgstr "åçæèåææéåæææçé"
 
-#: ../daemon/gvfsbackendburn.c:880
-#: ../daemon/gvfsbackendobexftp.c:1787
-#: ../daemon/gvfsbackendobexftp.c:1818
-#: ../daemon/gvfsbackendsftp.c:1829
-#: ../daemon/gvfsbackendsftp.c:4440
+#: ../daemon/gvfsbackendburn.c:880 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "çæææååå"
 
-#: ../daemon/gvfsbackendburn.c:945
-#: ../daemon/gvfsbackendcomputer.c:795
-#: ../daemon/gvfsbackendgphoto2.c:2504
-#: ../daemon/gvfsbackendgphoto2.c:2717
-#: ../daemon/gvfsbackendgphoto2.c:2814
-#: ../daemon/gvfsbackendgphoto2.c:2907
+#: ../daemon/gvfsbackendburn.c:945 ../daemon/gvfsbackendcomputer.c:795
+#: ../daemon/gvfsbackendgphoto2.c:2504 ../daemon/gvfsbackendgphoto2.c:2717
+#: ../daemon/gvfsbackendgphoto2.c:2814 ../daemon/gvfsbackendgphoto2.c:2907
 msgid "Not supported"
 msgstr "äææ"
 
-#: ../daemon/gvfsbackend.c:938
-#: ../monitor/gdu/ggdumount.c:922
+#: ../daemon/gvfsbackend.c:938 ../monitor/gdu/ggdumount.c:922
 #: ../monitor/udisks2/gvfsudisks2mount.c:734
 msgid "Unmount Anyway"
 msgstr "åååè"
 
-#: ../daemon/gvfsbackend.c:941
-#: ../monitor/gdu/ggdumount.c:924
+#: ../daemon/gvfsbackend.c:941 ../monitor/gdu/ggdumount.c:924
 #: ../monitor/udisks2/gvfsudisks2mount.c:737
 msgid ""
 "Volume is busy\n"
@@ -981,28 +843,23 @@ msgstr ""
 "ååååçä\n"
 "äæååæççåæåäçèåååã"
 
-#: ../daemon/gvfsbackendcdda.c:354
-#: ../daemon/gvfsbackendgphoto2.c:1508
+#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1508
 msgid "Cannot create gudev client"
 msgstr "äèåç gudev åæç"
 
-#: ../daemon/gvfsbackendcdda.c:374
-#: ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1526
 msgid "Cannot connect to the system bus"
 msgstr "äèéçåççåææ"
 
-#: ../daemon/gvfsbackendcdda.c:385
-#: ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1538
 msgid "Cannot create libhal context"
 msgstr "äèåç libhal èç"
 
-#: ../daemon/gvfsbackendcdda.c:399
-#: ../daemon/gvfsbackendgphoto2.c:1551
+#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1551
 msgid "Cannot initialize libhal"
 msgstr "äèååå libhal"
 
-#: ../daemon/gvfsbackendcdda.c:415
-#: ../daemon/gvfsbackendcdda.c:500
+#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:500
 msgid "No drive specified"
 msgstr "ææåèç"
 
@@ -1023,12 +880,9 @@ msgstr "èç %s ääååéæææ"
 msgid "cdda mount on %s"
 msgstr "cdda æèæ %s"
 
-#: ../daemon/gvfsbackendcdda.c:463
-#: ../daemon/gvfsbackendcdda.c:983
-#: ../monitor/gdu/ggduvolume.c:349
-#: ../monitor/hal/ghalmount.c:325
-#: ../monitor/hal/ghalvolume.c:225
-#: ../monitor/hal/ghalvolume.c:246
+#: ../daemon/gvfsbackendcdda.c:463 ../daemon/gvfsbackendcdda.c:983
+#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
+#: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #: ../monitor/udisks2/gvfsudisks2volume.c:308
 #, c-format
 msgid "Audio Disc"
@@ -1056,8 +910,7 @@ msgstr "äèçç %s äçãparanoiaãçéè"
 msgid "Error seeking in stream on drive %s"
 msgstr "åçç %s äæåäæççéè"
 
-#: ../daemon/gvfsbackendcdda.c:1004
-#: ../daemon/gvfsbackendgphoto2.c:1818
+#: ../daemon/gvfsbackendcdda.c:1004 ../daemon/gvfsbackendgphoto2.c:1818
 #, c-format
 msgid "No such file"
 msgstr "ææéåææ"
@@ -1071,8 +924,7 @@ msgstr "ææäååæäæéè"
 msgid "Audio CD File System Service"
 msgstr "éæ CD ææççæå"
 
-#: ../daemon/gvfsbackendcomputer.c:192
-#: ../daemon/gvfsbackendcomputer.c:757
+#: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:757
 msgid "Computer"
 msgstr "éè"
 
@@ -1084,14 +936,12 @@ msgstr "ææçç"
 msgid "Can't open mountable file"
 msgstr "äèéååæèåææ"
 
-#: ../daemon/gvfsbackendcomputer.c:841
-#: ../daemon/gvfsbackendsftp.c:1162
+#: ../daemon/gvfsbackendcomputer.c:841 ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "åéçéèï%s"
 
-#: ../daemon/gvfsbackendcomputer.c:873
-#: ../daemon/gvfsbackendcomputer.c:992
+#: ../daemon/gvfsbackendcomputer.c:873 ../daemon/gvfsbackendcomputer.c:992
 msgid "Can't mount file"
 msgstr "äèæèææ"
 
@@ -1099,12 +949,9 @@ msgstr "äèæèææ"
 msgid "No medium in the drive"
 msgstr "èçäææåé"
 
-#: ../daemon/gvfsbackendcomputer.c:942
-#: ../daemon/gvfsbackendcomputer.c:1037
-#: ../daemon/gvfsbackendcomputer.c:1143
-#: ../daemon/gvfsbackendcomputer.c:1233
-#: ../daemon/gvfsbackendcomputer.c:1306
-#: ../daemon/gvfsbackendcomputer.c:1375
+#: ../daemon/gvfsbackendcomputer.c:942 ../daemon/gvfsbackendcomputer.c:1037
+#: ../daemon/gvfsbackendcomputer.c:1143 ../daemon/gvfsbackendcomputer.c:1233
+#: ../daemon/gvfsbackendcomputer.c:1306 ../daemon/gvfsbackendcomputer.c:1375
 msgid "Not a mountable file"
 msgstr "äæåæèåææ"
 
@@ -1116,18 +963,15 @@ msgstr "äèåèææ"
 msgid "Can't eject file"
 msgstr "äèéåææ"
 
-#: ../daemon/gvfsbackendcomputer.c:1253
-#: ../daemon/gvfsbackendcomputer.c:1260
-msgid "Can't start file"
-msgstr "äèéåææ"
+#: ../daemon/gvfsbackendcomputer.c:1253 ../daemon/gvfsbackendcomputer.c:1260
+msgid "Can't start drive"
+msgstr "äèååèç"
 
-#: ../daemon/gvfsbackendcomputer.c:1326
-#: ../daemon/gvfsbackendcomputer.c:1333
-msgid "Can't stop file"
-msgstr "äèééææ"
+#: ../daemon/gvfsbackendcomputer.c:1326 ../daemon/gvfsbackendcomputer.c:1333
+msgid "Can't stop drive"
+msgstr "äèåæèç"
 
-#: ../daemon/gvfsbackendcomputer.c:1390
-#: ../daemon/gvfsbackendcomputer.c:1397
+#: ../daemon/gvfsbackendcomputer.c:1390 ../daemon/gvfsbackendcomputer.c:1397
 msgid "Can't poll file"
 msgstr "äèçæææ"
 
@@ -1147,8 +991,7 @@ msgstr "WebDAV ä %s æ %s%s"
 msgid "WebDAV on %s%s"
 msgstr "WebDAV æ %s%s"
 
-#: ../daemon/gvfsbackenddav.c:680
-#: ../daemon/gvfsbackenddav.c:1910
+#: ../daemon/gvfsbackenddav.c:680 ../daemon/gvfsbackenddav.c:1910
 #: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
@@ -1166,10 +1009,8 @@ msgstr "çççåæ"
 msgid "Unexpected reply from server"
 msgstr "äèäæåæéæçåæ"
 
-#: ../daemon/gvfsbackenddav.c:1394
-#: ../daemon/gvfsbackenddav.c:2039
-#: ../daemon/gvfsbackenddav.c:2126
-#: ../daemon/gvfsbackenddav.c:2233
+#: ../daemon/gvfsbackenddav.c:1394 ../daemon/gvfsbackenddav.c:2039
+#: ../daemon/gvfsbackenddav.c:2126 ../daemon/gvfsbackenddav.c:2233
 msgid "Response invalid"
 msgstr "åæçæ"
 
@@ -1186,32 +1027,26 @@ msgstr "èå %s çåç "
 msgid "Please enter proxy password"
 msgstr "èèåäçäæååç"
 
-#: ../daemon/gvfsbackenddav.c:1914
-#: ../daemon/gvfsbackenddav.c:1918
+#: ../daemon/gvfsbackenddav.c:1914 ../daemon/gvfsbackenddav.c:1918
 msgid "Not a WebDAV enabled share"
 msgstr "äæäç WebDAV çåä"
 
-#: ../daemon/gvfsbackenddav.c:1993
-#: ../daemon/gvfsbackenddav.c:2081
-#: ../daemon/gvfsbackenddav.c:2154
-#: ../daemon/gvfsbackenddav.c:2267
+#: ../daemon/gvfsbackenddav.c:1993 ../daemon/gvfsbackenddav.c:2081
+#: ../daemon/gvfsbackenddav.c:2154 ../daemon/gvfsbackenddav.c:2267
 msgid "Could not create request"
 msgstr "çæåçèæ"
 
-#: ../daemon/gvfsbackenddav.c:2401
-#: ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "åçåäææåæ"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:492
-#: ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:447
 msgid "Local Network"
 msgstr "æåççç"
 
-#: ../daemon/gvfsbackenddnssd.c:736
-#: ../daemon/gvfsbackendnetwork.c:752
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:828
 msgid "Can't monitor file or directory."
 msgstr "äèçææææçéã"
 
@@ -1220,10 +1055,8 @@ msgstr "äèçææææçéã"
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:755
-#: ../daemon/gvfsbackendnetwork.c:687
-#: ../daemon/gvfsbackendnetwork.c:819
-#: ../daemon/gvfsbackendnetwork.c:820
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:763
+#: ../daemon/gvfsbackendnetwork.c:895 ../daemon/gvfsbackendnetwork.c:896
 msgid "Network"
 msgstr "çç"
 
@@ -1239,6 +1072,11 @@ msgstr "èå %s å %s äç FTP åç "
 msgid "Enter password for FTP on %s"
 msgstr "èå %s ç FTP åç "
 
+#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:985
+#: ../daemon/gvfsbackendsmbbrowse.c:995 ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "åçåèçåèåæ"
+
 #: ../daemon/gvfsbackendftp.c:630
 #, c-format
 msgid "FTP on %s"
@@ -1254,9 +1092,8 @@ msgstr "ä %s çå %s ç FTP"
 msgid "Insufficient permissions"
 msgstr "æéäè"
 
-#: ../daemon/gvfsbackendftp.c:981
-#: ../daemon/gvfsbackendftp.c:1335
-#: ../daemon/gvfsbackendsftp.c:3273
+#: ../daemon/gvfsbackendftp.c:981 ../daemon/gvfsbackendftp.c:1335
+#: ../daemon/gvfsbackendsftp.c:3274
 msgid "backups not supported yet"
 msgstr "åäåæææ"
 
@@ -1281,16 +1118,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%sï%dïäææ"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:718
-#: ../daemon/gvfsbackendgphoto2.c:724
+#: ../daemon/gvfsbackendgphoto2.c:718 ../daemon/gvfsbackendgphoto2.c:724
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "æççæ (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:947
-#: ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:947 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1298,21 +1133,18 @@ msgstr "%s ççæ"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:950
-#: ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:950 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s éææææ"
 
-#: ../daemon/gvfsbackendgphoto2.c:959
-#: ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "ççæ"
 
-#: ../daemon/gvfsbackendgphoto2.c:961
-#: ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "éææææ"
 
@@ -1328,8 +1160,7 @@ msgstr "äèåç gphoto2 èç"
 msgid "Error creating camera"
 msgstr "åçæåæççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611
-#: ../daemon/gvfsbackendgphoto2.c:1621
+#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendgphoto2.c:1621
 msgid "Error loading device information"
 msgstr "èåèçèèæççéè"
 
@@ -1377,14 +1208,12 @@ msgstr "åææååèææççéè"
 msgid "Malformed icon identifier '%s'"
 msgstr "åçèåçã%sãæåäè"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
-#: ../daemon/gvfsbackendgphoto2.c:3178
+#: ../daemon/gvfsbackendgphoto2.c:1985 ../daemon/gvfsbackendgphoto2.c:3178
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "åæåæ %s äæåäæççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:2125
-#: ../daemon/gvfsbackendsftp.c:2951
+#: ../daemon/gvfsbackendgphoto2.c:2125 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "äæäåçé"
@@ -1405,18 +1234,15 @@ msgstr "åççéæççéè"
 msgid "Name already exists"
 msgstr "åçååå"
 
-#: ../daemon/gvfsbackendgphoto2.c:2740
-#: ../daemon/gvfsbackendgphoto2.c:3373
+#: ../daemon/gvfsbackendgphoto2.c:2740 ../daemon/gvfsbackendgphoto2.c:3373
 msgid "New name too long"
 msgstr "æçåçåé"
 
-#: ../daemon/gvfsbackendgphoto2.c:2750
-#: ../daemon/gvfsbackendgphoto2.c:3384
+#: ../daemon/gvfsbackendgphoto2.c:2750 ../daemon/gvfsbackendgphoto2.c:3384
 msgid "Error renaming directory"
 msgstr "éæååçéççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:2763
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:2763 ../daemon/gvfsbackendgphoto2.c:3397
 msgid "Error renaming file"
 msgstr "éæååæææççéè"
 
@@ -1458,15 +1284,19 @@ msgid "Not supported (not same directory)"
 msgstr "äææïäåçéï"
 
 #: ../daemon/gvfsbackendgphoto2.c:3341
-msgid "Not supported (the source is a directory, the destination is a directory too)"
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
 msgstr "äææ (äææçéïççäæçé)"
 
 #: ../daemon/gvfsbackendgphoto2.c:3349
-msgid "Not supported (the source is a directory, but the destination is an existing file)"
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
 msgstr "äææ (äææçéïççæçæçææ)"
 
 #: ../daemon/gvfsbackendgphoto2.c:3361
-msgid "Not supported (the source is a file, but the destination is a directory)"
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
 msgstr "äææ (äææææïççæçé)"
 
 #: ../daemon/gvfsbackendhttp.c:251
@@ -1478,15 +1308,22 @@ msgstr "HTTP åæçéèï%s"
 msgid "Directory notification not supported"
 msgstr "äææçééç"
 
+#: ../daemon/gvfsbackendnetwork.c:159
+msgid "File Sharing"
+msgstr "ææåä"
+
+#: ../daemon/gvfsbackendnetwork.c:164
+msgid "Remote Login"
+msgstr "éççå"
+
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:247
-#: ../daemon/gvfsbackendsmbbrowse.c:894
+#: ../daemon/gvfsbackendnetwork.c:323 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "Windows çç"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:872
+#: ../daemon/gvfsbackendnetwork.c:948
 msgid "Network Location Monitor"
 msgstr "ççäççèå"
 
@@ -1496,8 +1333,7 @@ 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/gvfsbackendobexftp.c:682
-#: ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
@@ -1515,8 +1351,7 @@ msgstr "åèççéçååå"
 msgid "Device requires a software update"
 msgstr "èçèæææèä"
 
-#: ../daemon/gvfsbackendobexftp.c:1855
-#: ../daemon/gvfsbackendsmb.c:1973
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "åéæææççéèï%s"
@@ -1527,13 +1362,11 @@ msgstr "æèäçéçèæääèåé"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendrecent.c:547
-#: ../daemon/gvfsbackendrecent.c:658
+#: ../daemon/gvfsbackendrecent.c:547 ../daemon/gvfsbackendrecent.c:658
 msgid "Recent"
 msgstr "æèäç"
 
-#: ../daemon/gvfsbackendsftp.c:303
-#: ../daemon/gvfsbackendsftp.c:657
+#: ../daemon/gvfsbackendsftp.c:303 ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "ssh çåæåçäæä"
 
@@ -1553,156 +1386,137 @@ msgstr "éçèäæåæç"
 msgid "Host key verification failed"
 msgstr "éèäæåçååæ"
 
-#: ../daemon/gvfsbackendsftp.c:501
+#: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
 msgstr "çæåå ssh çå"
 
-#: ../daemon/gvfsbackendsftp.c:517
+#: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "çæåå ssh çåï%s"
 
-#: ../daemon/gvfsbackendsftp.c:619
-#: ../daemon/gvfsbackendsftp.c:877
+#: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "çåéææé"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:957
+#: ../daemon/gvfsbackendsftp.c:958
 #, c-format
 msgid "Enter passphrase for key for ssh as %s on %s"
 msgstr "èå %s å %s äç ssh åçååè "
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:960
+#: ../daemon/gvfsbackendsftp.c:961
 #, c-format
 msgid "Enter password for ssh as %s on %s"
 msgstr "èå %s å %s äç ssh åç "
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:964
+#: ../daemon/gvfsbackendsftp.c:965
 #, c-format
 msgid "Enter passphrase for key for ssh on %s"
 msgstr "èåå %s äç ssh åçåçåè"
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:967
+#: ../daemon/gvfsbackendsftp.c:968
 #, c-format
 msgid "Enter password for ssh on %s"
 msgstr "èåå %s äç ssh åè"
 
-#: ../daemon/gvfsbackendsftp.c:1047
+#: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
 msgstr "äèåéåç"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
 msgstr "ååçå"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
 msgstr "åæçå"
 
-#: ../daemon/gvfsbackendsftp.c:1064
+#: ../daemon/gvfsbackendsftp.c:1065
 #, c-format
 msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is %s. If you want to be absolutely "
+"sure it is safe to continue, contact the system administrator."
 msgstr ""
 "éçéè (%s) çèåäæã\n"
 "ééåççåäçäæçåéèçæåã\n"
 "\n"
 "çéçéèåéçèåç %sãåæäæèååçåççæååçïèèçççççèã"
 
-#: ../daemon/gvfsbackendsftp.c:1084
+#: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
 msgstr "çååèçåèåæ"
 
-#: ../daemon/gvfsbackendsftp.c:1104
+#: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
 msgstr "äèåéäæèåçè"
 
-#: ../daemon/gvfsbackendsftp.c:1642
-#: ../daemon/gvfsbackendsftp.c:1665
+#: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
 msgstr "éèååéè"
 
 #. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1690
+#: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
 msgid "SFTP for %s on %s"
 msgstr "SFTP ä %s æ %s"
 
 #. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1693
+#: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
 msgid "SFTP on %s"
 msgstr "SFTP æ %s"
 
-#: ../daemon/gvfsbackendsftp.c:1734
+#: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "æäåææç ssh æä"
 
-#: ../daemon/gvfsbackendsftp.c:2008
-#: ../daemon/gvfsbackendsftp.c:2397
-#: ../daemon/gvfsbackendsftp.c:2476
-#: ../daemon/gvfsbackendsftp.c:2487
-#: ../daemon/gvfsbackendsftp.c:2543
-#: ../daemon/gvfsbackendsftp.c:2629
-#: ../daemon/gvfsbackendsftp.c:2679
-#: ../daemon/gvfsbackendsftp.c:2725
-#: ../daemon/gvfsbackendsftp.c:2800
-#: ../daemon/gvfsbackendsftp.c:2907
-#: ../daemon/gvfsbackendsftp.c:3024
-#: ../daemon/gvfsbackendsftp.c:3105
-#: ../daemon/gvfsbackendsftp.c:3177
-#: ../daemon/gvfsbackendsftp.c:3189
-#: ../daemon/gvfsbackendsftp.c:3245
-#: ../daemon/gvfsbackendsftp.c:3287
-#: ../daemon/gvfsbackendsftp.c:3472
-#: ../daemon/gvfsbackendsftp.c:3504
-#: ../daemon/gvfsbackendsftp.c:3559
-#: ../daemon/gvfsbackendsftp.c:3616
-#: ../daemon/gvfsbackendsftp.c:3913
-#: ../daemon/gvfsbackendsftp.c:3980
-#: ../daemon/gvfsbackendsftp.c:4113
-#: ../daemon/gvfsbackendsftp.c:4173
-#: ../daemon/gvfsbackendsftp.c:4208
-#: ../daemon/gvfsbackendsftp.c:4236
-#: ../daemon/gvfsbackendsftp.c:4344
-#: ../daemon/gvfsbackendsftp.c:4398
-#: ../daemon/gvfsbackendsftp.c:4437
-#: ../daemon/gvfsbackendsftp.c:4471
-#: ../daemon/gvfsbackendsftp.c:4505
-#: ../daemon/gvfsbackendsftp.c:4520
-#: ../daemon/gvfsbackendsftp.c:4535
-#: ../daemon/gvfsbackendsftp.c:4613
+#: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544 ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680 ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "æåçæçåæ"
 
-#: ../daemon/gvfsbackendsftp.c:2256
-#: ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr "ïçæçççï"
 
-#: ../daemon/gvfsbackendsftp.c:2341
+#: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
 msgstr "åæ"
 
-#: ../daemon/gvfsbackendsftp.c:2449
+#: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
 msgstr "OpenIconForRead äæçæç icon_id ã%sã"
 
-#: ../daemon/gvfsbackendsftp.c:2745
+#: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "åçåäæææççéèï%s"
 
-#: ../daemon/gvfsbackendsftp.c:3349
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "çæåçæåææ"
 
@@ -1738,8 +1552,7 @@ msgstr "Windows ççææççæå"
 msgid "Password required for share %s on %s"
 msgstr "èåä %2$s äç %1$s éèåç"
 
-#: ../daemon/gvfsbackendsmb.c:494
-#: ../daemon/gvfsbackendsmb.c:540
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "åéçéè (%s)"
@@ -1749,8 +1562,7 @@ msgstr "åéçéè (%s)"
 msgid "Failed to mount Windows share"
 msgstr "æè Windows åäåæ"
 
-#: ../daemon/gvfsbackendsmb.c:788
-#: ../daemon/gvfsbackendsmb.c:1284
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "äææçæåéå"
 
@@ -1785,20 +1597,17 @@ msgstr "äèåççåçé"
 msgid "Windows Shares File System Service"
 msgstr "Windows åäææççæå"
 
-#: ../daemon/gvfsbackendtrash.c:370
-#: ../daemon/gvfsbackendtrash.c:426
+#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "åæçèæääèåé"
 
-#: ../daemon/gvfsbackendtrash.c:387
-#: ../daemon/gvfsbackendtrash.c:440
+#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 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:755
-#: ../daemon/gvfsbackendtrash.c:863
+#: ../daemon/gvfsbackendtrash.c:755 ../daemon/gvfsbackendtrash.c:863
 msgid "Trash"
 msgstr "åæç"
 
@@ -1806,15 +1615,15 @@ msgstr "åæç"
 msgid "Unexpected end of stream"
 msgstr "æéæçäæçæ"
 
-#: ../daemon/gvfsftpconnection.c:196
-#: ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:411
-#: ../daemon/gvfsftptask.c:839
+#: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "çæçåæ"
 
 #: ../daemon/gvfsftpconnection.c:392
-msgid "Failed to create active FTP connection. Maybe your router does not support this?"
+msgid ""
+"Failed to create active FTP connection. Maybe your router does not support "
+"this?"
 msgstr "çæåçäçäç FTP éçãäèäçèçåäææåï"
 
 #: ../daemon/gvfsftpconnection.c:399
@@ -1845,8 +1654,7 @@ msgstr "çæéåèæéçãäèäçéççéæäåï"
 msgid "Data connection closed"
 msgstr "èæéçåéé"
 
-#: ../daemon/gvfsftptask.c:374
-#: ../daemon/gvfsftptask.c:378
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "æäååæ"
 
@@ -1874,14 +1682,12 @@ msgstr "åçäææçèéç"
 msgid "Invalid dbus message"
 msgstr "çæç dbus èæ"
 
-#: ../daemon/gvfsjobunmount.c:123
-#: ../monitor/udisks2/gvfsudisks2utils.c:805
+#: ../daemon/gvfsjobunmount.c:123 ../monitor/udisks2/gvfsudisks2utils.c:805
 #, c-format
 msgid "%s has been unmounted\n"
 msgstr "%s åèåè\n"
 
-#: ../daemon/gvfsjobunmount.c:141
-#: ../monitor/udisks2/gvfsudisks2utils.c:659
+#: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:659
 #, c-format
 msgid ""
 "Unmounting %s\n"
@@ -1894,8 +1700,7 @@ msgstr ""
 msgid "File system is busy"
 msgstr "ææççåçä"
 
-#: ../daemon/main.c:133
-#: ../metadata/meta-daemon.c:445
+#: ../daemon/main.c:133 ../metadata/meta-daemon.c:445
 msgid "Replace old daemon."
 msgstr "çæèçäæçåã"
 
@@ -1913,77 +1718,60 @@ msgstr "GCFS ääæçå"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:166
-#: ../metadata/meta-daemon.c:470
+#: ../daemon/main.c:166 ../metadata/meta-daemon.c:470
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:168
-#: ../metadata/meta-daemon.c:472
-#: ../programs/gvfs-cat.c:170
-#: ../programs/gvfs-cat.c:182
-#: ../programs/gvfs-copy.c:133
-#: ../programs/gvfs-info.c:387
-#: ../programs/gvfs-ls.c:416
-#: ../programs/gvfs-mime.c:97
-#: ../programs/gvfs-mime.c:107
-#: ../programs/gvfs-mime.c:114
-#: ../programs/gvfs-mkdir.c:71
-#: ../programs/gvfs-monitor-dir.c:126
-#: ../programs/gvfs-monitor-file.c:125
-#: ../programs/gvfs-mount.c:1036
-#: ../programs/gvfs-move.c:121
-#: ../programs/gvfs-open.c:78
-#: ../programs/gvfs-open.c:90
-#: ../programs/gvfs-rename.c:75
-#: ../programs/gvfs-rm.c:72
-#: ../programs/gvfs-save.c:175
-#: ../programs/gvfs-set-attribute.c:151
-#: ../programs/gvfs-trash.c:71
+#: ../daemon/main.c:168 ../metadata/meta-daemon.c:472
+#: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:182
+#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:389
+#: ../programs/gvfs-ls.c:416 ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:107 ../programs/gvfs-mime.c:114
+#: ../programs/gvfs-mkdir.c:71 ../programs/gvfs-monitor-dir.c:126
+#: ../programs/gvfs-monitor-file.c:125 ../programs/gvfs-mount.c:1036
+#: ../programs/gvfs-move.c:121 ../programs/gvfs-open.c:78
+#: ../programs/gvfs-open.c:90 ../programs/gvfs-rename.c:75
+#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:178
+#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:71
 #: ../programs/gvfs-tree.c:262
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "äçã%s --helpãäçåæåèèã"
 
-#: ../daemon/mount.c:674
+#: ../daemon/mount.c:693
 #, c-format
 msgid "Automount failed: %s"
 msgstr "èåæèåæï%s"
 
-#: ../daemon/mount.c:718
-#: ../daemon/mount.c:779
+#: ../daemon/mount.c:737 ../daemon/mount.c:798
 msgid "The specified location is not mounted"
 msgstr "æåçäçåææè"
 
-#: ../daemon/mount.c:723
+#: ../daemon/mount.c:742
 msgid "The specified location is not supported"
 msgstr "æåçäçäèææ"
 
-#: ../daemon/mount.c:847
+#: ../daemon/mount.c:866
 msgid "Location is already mounted"
 msgstr "èäçåçæèä"
 
-#: ../daemon/mount.c:856
+#: ../daemon/mount.c:875
 msgid "Location is not mountable"
 msgstr "èäçäæåæèç"
 
-#: ../metadata/meta-daemon.c:133
-#: ../metadata/meta-daemon.c:253
-#: ../metadata/meta-daemon.c:302
-#: ../metadata/meta-daemon.c:337
+#: ../metadata/meta-daemon.c:133 ../metadata/meta-daemon.c:253
+#: ../metadata/meta-daemon.c:302 ../metadata/meta-daemon.c:337
 #: ../metadata/meta-daemon.c:373
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "æäåäçèæææ %s"
 
-#: ../metadata/meta-daemon.c:151
-#: ../metadata/meta-daemon.c:163
+#: ../metadata/meta-daemon.c:151 ../metadata/meta-daemon.c:163
 msgid "Unable to set metadata key"
 msgstr "çæèåäçèæçéå"
 
-#: ../metadata/meta-daemon.c:173
-#: ../metadata/meta-daemon.c:312
+#: ../metadata/meta-daemon.c:173 ../metadata/meta-daemon.c:312
 msgid "Unable to unset metadata key"
 msgstr "çæåæäçèæçèåé"
 
@@ -2007,24 +1795,20 @@ msgstr "GVFS çäçèæäæçå"
 msgid "GVfs GDU Volume Monitor"
 msgstr "GVfs GDU åååçæçå"
 
-#: ../monitor/gdu/ggdudrive.c:168
-#: ../monitor/hal/ghaldrive.c:179
+#: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
 msgstr "èçæ"
 
-#: ../monitor/gdu/ggdudrive.c:258
-#: ../monitor/udisks2/gvfsudisks2drive.c:200
+#: ../monitor/gdu/ggdudrive.c:258 ../monitor/udisks2/gvfsudisks2drive.c:200
 #, c-format
 msgid "Unnamed Drive (%s)"
 msgstr "æååççç (%s)"
 
-#: ../monitor/gdu/ggdudrive.c:260
-#: ../monitor/udisks2/gvfsudisks2drive.c:202
+#: ../monitor/gdu/ggdudrive.c:260 ../monitor/udisks2/gvfsudisks2drive.c:202
 msgid "Unnamed Drive"
 msgstr "æååççç"
 
-#: ../monitor/gdu/ggdudrive.c:561
-#: ../monitor/udisks2/gvfsudisks2drive.c:505
+#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:505
 #, c-format
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr "éååéåæïèåéäçäæåååååæååçã"
@@ -2032,7 +1816,8 @@ msgstr "éååéåæïèåéäçäæåååååæååçã
 #: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
-"Starting a drive in degraded mode means that the drive is no longer tolerant to failures. Data on the drive may be irrevocably lost if a component fails."
+"Starting a drive in degraded mode means that the drive is no longer tolerant "
+"to failures. Data on the drive may be irrevocably lost if a component fails."
 msgstr ""
 "æåäéçæåååèçï\n"
 "äéçæåååèçäèèèçåäåèåéãåææåäççéèïèçäçèæåèææéæåã"
@@ -2041,8 +1826,7 @@ msgstr ""
 msgid "Start Anyway"
 msgstr "åååå"
 
-#: ../monitor/gdu/ggdumount.c:857
-#: ../monitor/udisks2/gvfsudisks2mount.c:649
+#: ../monitor/gdu/ggdumount.c:857 ../monitor/udisks2/gvfsudisks2mount.c:649
 msgid "One or more programs are preventing the unmount operation."
 msgstr "äæååçåéæäåèçæäã"
 
@@ -2086,177 +1870,141 @@ msgstr ""
 "èåçäèéåååçåç\n"
 "èç %s åæååçèæã"
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "CD-ROM Disc"
 msgstr "CD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "Blank CD-ROM Disc"
 msgstr "çç CD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
 msgstr "CD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
 msgstr "çç CD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
 msgstr "CD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
 msgstr "çç CD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "DVD-ROM Disc"
 msgstr "DVD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "Blank DVD-ROM Disc"
 msgstr "çç DVD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "DVD-RAM Disc"
 msgstr "DVD-RAM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "Blank DVD-RAM Disc"
 msgstr "çç DVD-RAM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "DVD-RW Disc"
 msgstr "DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
 msgstr "çç DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
 msgstr "DVD+R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "Blank DVD+R Disc"
 msgstr "çç DVD+R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
 msgstr "DVD+RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
 msgstr "çç DVD+RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "DVD+R DL Disc"
 msgstr "DVD+R DL åç"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "Blank DVD+R DL Disc"
 msgstr "çç DVD+R DL åç"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blu-Ray Disc"
 msgstr "Blu-Ray åç"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blank Blu-Ray Disc"
 msgstr "çç Blu-Ray åç"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blu-Ray R Disc"
 msgstr "Blu-Ray R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blank Blu-Ray R Disc"
 msgstr "çç Blu-Ray R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blu-Ray RW Disc"
 msgstr "Blu-Ray RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blank Blu-Ray RW Disc"
 msgstr "çç Blu-Ray RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "HD DVD Disc"
 msgstr "HD DVD åç"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "Blank HD DVD Disc"
 msgstr "çç HD DVD åç"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "HD DVD-R Disc"
 msgstr "HD DVD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "Blank HD DVD-R Disc"
 msgstr "çç HD DVD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "HD DVD-RW Disc"
 msgstr "HD DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "Blank HD DVD-RW Disc"
 msgstr "çç HD DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "MO Disc"
 msgstr "MO åç"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "Blank MO Disc"
 msgstr "çç MO åç"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Disc"
 msgstr "åç"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Blank Disc"
 msgstr "ççåç"
 
@@ -2403,26 +2151,22 @@ msgstr "åéåæèç"
 msgid "Failed to eject media; one or more volumes on the media are busy."
 msgstr "éååéåæïèåéäçäæååååèçæååçã"
 
-#: ../monitor/hal/ghalmount.c:159
-#: ../monitor/hal/ghalvolume.c:163
+#: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../monitor/hal/ghalmount.c:164
-#: ../monitor/hal/ghalvolume.c:168
+#: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../monitor/hal/ghalmount.c:169
-#: ../monitor/hal/ghalvolume.c:173
+#: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../monitor/hal/ghalmount.c:323
-#: ../monitor/hal/ghalvolume.c:244
+#: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
 msgstr "æåéæ/èæåç"
 
@@ -2565,8 +2309,7 @@ msgstr "%s: %sïèåæææççéèï%s\n"
 msgid "%s: %s:error closing: %s\n"
 msgstr "%s: %s:ççéèææéé: %s\n"
 
-#: ../programs/gvfs-cat.c:143
-#: ../programs/gvfs-open.c:61
+#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61
 #: ../programs/gvfs-rm.c:58
 msgid "FILE"
 msgstr "FILE"
@@ -2595,22 +2338,14 @@ msgstr ""
 "ææïåèåçåçéé cat ååääçåçæåéé\n"
 "å -n, -T æåäã"
 
-#: ../programs/gvfs-cat.c:168
-#: ../programs/gvfs-copy.c:131
-#: ../programs/gvfs-info.c:385
-#: ../programs/gvfs-ls.c:414
-#: ../programs/gvfs-mime.c:94
-#: ../programs/gvfs-mkdir.c:69
-#: ../programs/gvfs-monitor-dir.c:124
-#: ../programs/gvfs-monitor-file.c:123
-#: ../programs/gvfs-mount.c:1034
-#: ../programs/gvfs-move.c:119
-#: ../programs/gvfs-open.c:76
-#: ../programs/gvfs-rename.c:73
-#: ../programs/gvfs-rm.c:70
-#: ../programs/gvfs-save.c:173
-#: ../programs/gvfs-set-attribute.c:149
-#: ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:131
+#: ../programs/gvfs-info.c:387 ../programs/gvfs-ls.c:414
+#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:69
+#: ../programs/gvfs-monitor-dir.c:124 ../programs/gvfs-monitor-file.c:123
+#: ../programs/gvfs-mount.c:1034 ../programs/gvfs-move.c:119
+#: ../programs/gvfs-open.c:76 ../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:69
 #: ../programs/gvfs-tree.c:260
 #, c-format
 msgid "Error parsing commandline options: %s\n"
@@ -2618,24 +2353,20 @@ 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:180
-#: ../programs/gvfs-open.c:88
+#: ../programs/gvfs-cat.c:180 ../programs/gvfs-open.c:88
 #, c-format
 msgid "%s: missing locations"
 msgstr "%sïææäç"
 
-#: ../programs/gvfs-copy.c:44
-#: ../programs/gvfs-move.c:42
+#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
 msgid "No target directory"
 msgstr "äæçæçé"
 
-#: ../programs/gvfs-copy.c:45
-#: ../programs/gvfs-move.c:43
+#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
 msgid "Show progress"
 msgstr "éçéå"
 
-#: ../programs/gvfs-copy.c:46
-#: ../programs/gvfs-move.c:44
+#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
 msgid "Prompt before overwrite"
 msgstr "åèèåæçäçè"
 
@@ -2643,8 +2374,7 @@ msgstr "åèèåæçäçè"
 msgid "Preserve all attributes"
 msgstr "äçææåæ"
 
-#: ../programs/gvfs-copy.c:48
-#: ../programs/gvfs-move.c:45
+#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
 #: ../programs/gvfs-save.c:43
 msgid "Backup existing destination files"
 msgstr "åäææçççææ"
@@ -2653,20 +2383,17 @@ msgstr "åäææçççææ"
 msgid "Never follow symbolic links"
 msgstr "æäèèçèéç"
 
-#: ../programs/gvfs-copy.c:78
-#: ../programs/gvfs-move.c:67
+#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
 #, c-format
 msgid "progress"
 msgstr "éå"
 
-#: ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-move.c:109
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-move.c:109
-#: ../programs/gvfs-save.c:162
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
+#: ../programs/gvfs-save.c:165
 msgid "DEST"
 msgstr "DEST"
 
@@ -2674,19 +2401,16 @@ msgstr "DEST"
 msgid "Copy one or more files from SOURCE to DEST."
 msgstr "åäæååææå SOURCE èèå DESTã"
 
-#: ../programs/gvfs-copy.c:141
-#: ../programs/gvfs-move.c:129
+#: ../programs/gvfs-copy.c:141 ../programs/gvfs-move.c:129
 #: ../programs/gvfs-rename.c:83
 msgid "Missing operand\n"
 msgstr "çåéçæ\n"
 
-#: ../programs/gvfs-copy.c:149
-#: ../programs/gvfs-move.c:137
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 msgid "Too many arguments\n"
 msgstr "åæåå\n"
 
-#: ../programs/gvfs-copy.c:158
-#: ../programs/gvfs-move.c:146
+#: ../programs/gvfs-copy.c:158 ../programs/gvfs-move.c:146
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "çæ %s äæçé\n"
@@ -2709,18 +2433,15 @@ msgstr "åååååæ"
 msgid "Get file system info"
 msgstr "ååææççèè"
 
-#: ../programs/gvfs-info.c:39
-#: ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "The attributes to get"
 msgstr "èååçåæ"
 
-#: ../programs/gvfs-info.c:39
-#: ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "ATTRIBUTES"
 msgstr "ATTRIBUTES"
 
-#: ../programs/gvfs-info.c:40
-#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
 msgid "Don't follow symbolic links"
 msgstr "äèèèçèéç"
@@ -2762,78 +2483,74 @@ msgstr "åæè"
 msgid "attributes:\n"
 msgstr "åæï\n"
 
-#: ../programs/gvfs-info.c:155
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:156
 #, c-format
 msgid "display name: %s\n"
 msgstr "éçåçï%s\n"
 
-#: ../programs/gvfs-info.c:159
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:161
 #, c-format
 msgid "edit name: %s\n"
 msgstr "çèåçï%s\n"
 
-#: ../programs/gvfs-info.c:165
+#: ../programs/gvfs-info.c:167
 #, c-format
 msgid "name: %s\n"
 msgstr "åçï%s\n"
 
-#: ../programs/gvfs-info.c:172
+#: ../programs/gvfs-info.c:174
 #, c-format
 msgid "type: %s\n"
 msgstr "éåï%s\n"
 
-#: ../programs/gvfs-info.c:178
+#: ../programs/gvfs-info.c:180
 #, c-format
 msgid "size: "
 msgstr "ååï"
 
-#: ../programs/gvfs-info.c:183
+#: ../programs/gvfs-info.c:185
 #, c-format
 msgid "hidden\n"
 msgstr "éè\n"
 
-#: ../programs/gvfs-info.c:268
+#: ../programs/gvfs-info.c:270
 msgid "Copy with file"
 msgstr "éææèè"
 
-#: ../programs/gvfs-info.c:272
+#: ../programs/gvfs-info.c:274
 msgid "Keep with file when moved"
 msgstr "çåæäæææ"
 
-#: ../programs/gvfs-info.c:309
+#: ../programs/gvfs-info.c:311
 #, c-format
 msgid "Error getting writable attributes: %s\n"
 msgstr "ååååååææççéèï%s\n"
 
-#: ../programs/gvfs-info.c:314
+#: ../programs/gvfs-info.c:316
 #, c-format
 msgid "Settable attributes:\n"
 msgstr "åèååæï\n"
 
-#: ../programs/gvfs-info.c:337
+#: ../programs/gvfs-info.c:339
 #, c-format
 msgid "Writable attribute namespaces:\n"
 msgstr "ååååæååçéï\n"
 
-#: ../programs/gvfs-info.c:373
-#: ../programs/gvfs-ls.c:397
-#: ../programs/gvfs-mkdir.c:57
-#: ../programs/gvfs-monitor-dir.c:112
-#: ../programs/gvfs-monitor-file.c:111
-#: ../programs/gvfs-mount.c:1022
-#: ../programs/gvfs-rename.c:64
-#: ../programs/gvfs-set-attribute.c:139
-#: ../programs/gvfs-trash.c:57
-#: ../programs/gvfs-tree.c:248
+#: ../programs/gvfs-info.c:375 ../programs/gvfs-ls.c:397
+#: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-monitor-dir.c:112
+#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1022
+#: ../programs/gvfs-rename.c:64 ../programs/gvfs-set-attribute.c:139
+#: ../programs/gvfs-trash.c:57 ../programs/gvfs-tree.c:248
 msgid "LOCATION"
 msgstr "LOCATION"
 
-#: ../programs/gvfs-info.c:374
+#: ../programs/gvfs-info.c:376
 msgid "Show information about locations."
 msgstr "éçäçççéèèã"
 
-#: ../programs/gvfs-ls.c:40
-#: ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
 msgstr "éçéèææ"
 
@@ -2849,8 +2566,7 @@ msgstr "éçèé"
 msgid "PREFIX"
 msgstr "PREFIX"
 
-#: ../programs/gvfs-ls.c:166
-#: ../programs/gvfs-ls.c:174
+#: ../programs/gvfs-ls.c:166 ../programs/gvfs-ls.c:174
 #: ../programs/gvfs-rename.c:97
 #, c-format
 msgid "Error: %s\n"
@@ -2954,14 +2670,12 @@ msgstr "åçäåçé"
 msgid "Create directories."
 msgstr "åççéã"
 
-#: ../programs/gvfs-mkdir.c:89
-#: ../programs/gvfs-mkdir.c:98
+#: ../programs/gvfs-mkdir.c:89 ../programs/gvfs-mkdir.c:98
 #, 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:38 ../programs/gvfs-monitor-file.c:38
 msgid "Don't send single MOVED events"
 msgstr "äèéååä MOVED ää"
 
@@ -3014,8 +2728,7 @@ msgstr "çèää"
 msgid "Show extra information"
 msgstr "éçéåçèè"
 
-#: ../programs/gvfs-mount.c:169
-#: ../programs/gvfs-mount.c:193
+#: ../programs/gvfs-mount.c:169 ../programs/gvfs-mount.c:193
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "æèäçæççéèï %s\n"
@@ -3025,8 +2738,7 @@ msgstr "æèäçæççéèï %s\n"
 msgid "Error unmounting mount: %s\n"
 msgstr "åèæççéèï %s\n"
 
-#: ../programs/gvfs-mount.c:276
-#: ../programs/gvfs-mount.c:325
+#: ../programs/gvfs-mount.c:276 ../programs/gvfs-mount.c:325
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "åæåèæèççéèï%s\n"
@@ -3094,8 +2806,7 @@ msgstr "ææææåçã"
 msgid "Rename successful. New uri: %s\n"
 msgstr "éæååæåãæç URIï%s\n"
 
-#: ../programs/gvfs-rm.c:34
-#: ../programs/gvfs-trash.c:34
+#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:34
 msgid "Ignore nonexistent files, never prompt"
 msgstr "åçäååçææïæäæç"
 
@@ -3115,38 +2826,41 @@ msgstr "æååææççå"
 msgid "When creating, restrict access to the current user"
 msgstr "çåçæïååæåéæçåçäçè"
 
-#: ../programs/gvfs-save.c:47
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:48
 msgid "Print new etag at end"
 msgstr "åçåååæç etag"
 
-#: ../programs/gvfs-save.c:48
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:50
 msgid "The etag of the file being overwritten"
 msgstr "ååèèçææ etag"
 
-#: ../programs/gvfs-save.c:48
+#: ../programs/gvfs-save.c:50
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../programs/gvfs-save.c:76
+#: ../programs/gvfs-save.c:78
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "éåæææççéèï%s\n"
 
-#: ../programs/gvfs-save.c:109
+#: ../programs/gvfs-save.c:111
 msgid "Error reading stdin"
 msgstr "èå stdin æççéè"
 
-#: ../programs/gvfs-save.c:122
+#: ../programs/gvfs-save.c:124
 #, c-format
 msgid "Error closing: %s\n"
 msgstr "ééæççéèï%s\n"
 
-#: ../programs/gvfs-save.c:134
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:137
 #, c-format
 msgid "Etag not available\n"
 msgstr "Etag çæäç\n"
 
-#: ../programs/gvfs-save.c:163
+#: ../programs/gvfs-save.c:166
 msgid "Read from standard input and save to DEST."
 msgstr "åææèåèåäååå DESTã"
 
@@ -3209,6 +2923,24 @@ msgstr "èèçèéçãæèåæå"
 msgid "List contents of directories in a tree-like format."
 msgstr "äæçæåååçéçååã"
 
+#~ msgid "AFP server %s declined the submitted password"
+#~ msgstr "AFP äæå %s æçäéåçåç"
+
+#~ msgid "Received invalid reply from server"
+#~ msgstr "åäæåååçæçåè"
+
+#~ msgid "Enter password for afp as %s on %s"
+#~ msgstr "èå %s å %s äç afp åç "
+
+#~ msgid "Enter password for afp on %s"
+#~ msgstr "èå %s ç afp åç "
+
+#~ msgid "Failed to logout from server"
+#~ msgstr "çæåäæåçå"
+
+#~ msgid "ID not found"
+#~ msgstr "æäå ID"
+
 #~ msgid "Error creating socket: %s"
 #~ msgstr "åç socket æççéèï%s"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index e143684..fe620be 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gvfs 1.11.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-23 15:42+0800\n"
-"PO-Revision-Date: 2012-08-23 15:43+0800\n"
+"POT-Creation-Date: 2012-08-27 18:35+0800\n"
+"PO-Revision-Date: 2012-08-26 08:31+0800\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau yahoo com tw>\n"
 "Language-Team: Chinese (traditional)\n"
 "Language: \n"
@@ -17,19 +17,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../client/gdaemonfile.c:416
-#: ../client/gdaemonfile.c:2767
+#: ../client/gdaemonfile.c:416 ../client/gdaemonfile.c:2767
 msgid "Operation not supported, files on different mounts"
 msgstr "ææåäåæèéïäææææä"
 
-#: ../client/gdaemonfile.c:1034
-#: ../client/gdaemonfile.c:3110
+#: ../client/gdaemonfile.c:1034 ../client/gdaemonfile.c:3110
 #: ../client/gvfsiconloadable.c:304
 msgid "Couldn't get stream file descriptor"
 msgstr "çæååäææææææèå"
 
-#: ../client/gdaemonfile.c:1163
-#: ../client/gdaemonfile.c:1235
+#: ../client/gdaemonfile.c:1163 ../client/gdaemonfile.c:1235
 #: ../client/gvfsiconloadable.c:129
 msgid "Didn't get stream file descriptor"
 msgstr "äèååäææææææèå"
@@ -50,20 +47,17 @@ msgstr "æäåæåæèé"
 msgid "Invalid filename %s"
 msgstr "çæçææåç %s"
 
-#: ../client/gdaemonfile.c:2609
-#: ../client/gdaemonvfs.c:1286
+#: ../client/gdaemonfile.c:2609 ../client/gdaemonvfs.c:1286
 #: ../client/gdaemonvfs.c:1338
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "èåææäçèææççéèï%s"
 
-#: ../client/gdaemonfile.c:2610
-#: ../client/gdaemonvfs.c:1339
+#: ../client/gdaemonfile.c:2610 ../client/gdaemonvfs.c:1339
 msgid "values must be string or list of strings"
 msgstr "æååéçåäæåäçæå"
 
-#: ../client/gdaemonfileenumerator.c:529
-#: ../client/gdaemonfileenumerator.c:612
+#: ../client/gdaemonfileenumerator.c:529 ../client/gdaemonfileenumerator.c:612
 #: ../client/gdaemonfileenumerator.c:663
 #: ../client/gdaemonfileinputstream.c:630
 #: ../client/gdaemonfileinputstream.c:783
@@ -73,38 +67,22 @@ msgstr "æååéçåäæåäçæå"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052
-#: ../client/gvfsdaemondbus.c:726
-#: ../daemon/gvfsbackendobexftp.c:1085
-#: ../daemon/gvfsbackendobexftp.c:1106
-#: ../daemon/gvfsbackendobexftp.c:1225
-#: ../daemon/gvfsbackendobexftp.c:1362
-#: ../daemon/gvfsbackendobexftp.c:1426
-#: ../daemon/gvfsbackendobexftp.c:1628
-#: ../daemon/gvfsbackendobexftp.c:1735
-#: ../daemon/gvfsbackendobexftp.c:1897
-#: ../daemon/gvfsbackendobexftp.c:1924
-#: ../daemon/gvfsbackendobexftp.c:1983
-#: ../daemon/gvfsbackendobexftp.c:2005
-#: ../daemon/gvfsbackendobexftp.c:2068
-#: ../daemon/gvfsbackendobexftp.c:2087
-#: ../daemon/gvfsbackendsmb.c:1179
-#: ../daemon/gvfsbackendtest.c:91
-#: ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187
-#: ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202
-#: ../monitor/gdu/ggdumount.c:1070
-#: ../monitor/proxy/gproxydrive.c:522
-#: ../monitor/proxy/gproxydrive.c:610
-#: ../monitor/proxy/gproxydrive.c:760
-#: ../monitor/proxy/gproxydrive.c:898
-#: ../monitor/proxy/gproxydrive.c:936
-#: ../monitor/proxy/gproxydrive.c:1061
-#: ../monitor/proxy/gproxymount.c:475
-#: ../monitor/proxy/gproxymount.c:560
-#: ../monitor/proxy/gproxyvolume.c:829
-#: ../monitor/proxy/gproxyvolume.c:892
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:726
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
+#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070
+#: ../monitor/proxy/gproxydrive.c:522 ../monitor/proxy/gproxydrive.c:610
+#: ../monitor/proxy/gproxydrive.c:760 ../monitor/proxy/gproxydrive.c:898
+#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1061
+#: ../monitor/proxy/gproxymount.c:475 ../monitor/proxy/gproxymount.c:560
+#: ../monitor/proxy/gproxyvolume.c:829 ../monitor/proxy/gproxyvolume.c:892
 msgid "Operation was cancelled"
 msgstr "æäåèåæ"
 
@@ -169,8 +147,12 @@ msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéè"
 #.
 #: ../common/gvfsdnssdresolver.c:1126
 #, c-format
-msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
-msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéèãäæåå TXT çééåãéèèåéïã%4$sã"
+msgid ""
+"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
+"records are missing. Keys required: \"%s\"."
+msgstr ""
+"èæçåã%3$sãäæåã%2$sãçã%1$sãæççéèãäæåå TXT çééåãé"
+"èèåéïã%4$sã"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -182,8 +164,7 @@ msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãæççéèã
 msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
 msgstr "èæçåã%3$sãäæåã%2$sãçã%1$sãéæ"
 
-#: ../common/gvfsdnssdutils.c:233
-#: ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
 #: ../common/gvfsdnssdutils.c:280
 #, c-format
 msgid "Malformed dns-sd encoded_triple '%s'"
@@ -205,33 +186,29 @@ msgstr "GVfsIcon çèåèææåäè"
 msgid "%s File System Service"
 msgstr "%s ææççæå"
 
-#: ../daemon/daemon-main.c:176
-#: ../daemon/daemon-main.c:306
-#: ../programs/gvfs-copy.c:90
-#: ../programs/gvfs-move.c:78
-#: ../programs/gvfs-rename.c:36
+#: ../daemon/daemon-main.c:178 ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
 #: ../programs/gvfs-set-attribute.c:105
 #, c-format
 msgid "Error: %s"
 msgstr "éèï%s"
 
-#: ../daemon/daemon-main.c:233
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "çæï%s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:257
-#: ../daemon/daemon-main.c:275
+#: ../daemon/daemon-main.c:260 ../daemon/daemon-main.c:278
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "çæï %s key=value key=value â"
 
-#: ../daemon/daemon-main.c:273
+#: ../daemon/daemon-main.c:276
 #, c-format
 msgid "No mount type specified"
 msgstr "ææåæèéå"
 
-#: ../daemon/daemon-main.c:305
+#: ../daemon/daemon-main.c:308
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s çæèéååäçä"
@@ -256,118 +233,101 @@ msgstr "éçæéæçäæ"
 msgid "Got EOS"
 msgstr "åå EOS"
 
-#: ../daemon/gvfsafpserver.c:198
-#: ../daemon/gvfsafpserver.c:477
-#, c-format
-msgid "Server doesn't support passwords longer than %d characters"
-msgstr "äæåäææéåèé %d ååçåç"
-
-#: ../daemon/gvfsafpserver.c:222
-#: ../daemon/gvfsafpserver.c:528
-msgid "An invalid username was provided"
-msgstr "èåäçæçäçèåç"
-
-#: ../daemon/gvfsafpserver.c:391
-#: ../daemon/gvfsafpserver.c:618
-#, c-format
-msgid "AFP server %s declined the submitted password"
-msgstr "AFP äæå %s æçäéåçåç"
-
-#: ../daemon/gvfsafpserver.c:426
-#: ../daemon/gvfsafpserver.c:645
-#: ../daemon/gvfsafpserver.c:818
-#: ../daemon/gvfsafpserver.c:864
-#: ../daemon/gvfsafpserver.c:978
-#: ../daemon/gvfsafpserver.c:1352
-#: ../daemon/gvfsafpserver.c:1654
-#: ../daemon/gvfsafpserver.c:1743
-#, c-format
-msgid "Received invalid reply from server"
-msgstr "åäæåååçæçåè"
-
-#: ../daemon/gvfsafpserver.c:670
-#: ../daemon/gvfsafpserver.c:695
-#, c-format
-msgid "AFP server %s doesn't support anonymous login"
-msgstr "AFP äæå %s äææååçå"
-
-#: ../daemon/gvfsafpserver.c:723
-#, c-format
-msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
-msgstr "çå AFP äæå %s åæ (æäååéçéèæå)"
-
-#: ../daemon/gvfsafpserver.c:797
-#: ../daemon/gvfsafpserver.c:818
-#, c-format
-msgid "Failed to connect to server (%s)"
-msgstr "çæéçèäæå (%s)"
-
-#: ../daemon/gvfsafpserver.c:797
-msgid "Server doesn't support AFP version 3.0 or later"
-msgstr "äæåäææ AFP ç 3.0 çäåççæ"
-
-#: ../daemon/gvfsafpserver.c:903
-#: ../daemon/gvfsafpvolume.c:390
-#: ../daemon/gvfsafpvolume.c:668
-#: ../daemon/gvfsafpvolume.c:821
-#: ../daemon/gvfsafpvolume.c:1015
-#: ../daemon/gvfsafpvolume.c:1215
-#: ../daemon/gvfsafpvolume.c:1398
-#: ../daemon/gvfsafpvolume.c:1555
-#: ../daemon/gvfsafpvolume.c:2001
-#: ../daemon/gvfsafpvolume.c:2127
-#: ../daemon/gvfsafpvolume.c:2289
-#: ../daemon/gvfsafpvolume.c:2509
-#: ../daemon/gvfsbackendafc.c:286
-#: ../daemon/gvfsbackendsftp.c:311
-#: ../daemon/gvfsbackendsftp.c:1833
-#: ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
-msgid "Permission denied"
-msgstr "æéäè"
+msgid "The server doesn't support passwords longer than %d character."
+msgid_plural "The server doesn't support passwords longer than %d characters."
+msgstr[0] "äæåäææéåèé %d ååçåçã"
+
+#: ../daemon/gvfsafpserver.c:224 ../daemon/gvfsafpserver.c:533
+msgid "An invalid username was provided."
+msgstr "èåäçæçäçèåçã"
 
-#: ../daemon/gvfsafpserver.c:908
+#: ../daemon/gvfsafpserver.c:393
 #, c-format
-msgid "Command is not supported by server"
-msgstr "äæåäæææä"
+msgid "Unable to login to the server â%sâ with the given password."
+msgstr "çæäæåçåççåäæåâ%sâã"
 
-#: ../daemon/gvfsafpserver.c:912
+#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650
+#: ../daemon/gvfsafpserver.c:825 ../daemon/gvfsafpserver.c:873
+#: ../daemon/gvfsafpserver.c:989
 #, c-format
-msgid "User's password has expired"
-msgstr "äçèçåçåéæ"
+msgid "Unable to connect to the server â%sâ. A communication problem occurred."
+msgstr "çæéçåäæåâ%sâãççéèåéã"
 
-#: ../daemon/gvfsafpserver.c:916
+#: ../daemon/gvfsafpserver.c:623
 #, c-format
-msgid "User's password needs to be changed"
-msgstr "äçèçåçéèèæ"
+msgid "Unable to connect to the server â%sâ with the given password."
+msgstr "çæäæåçåçéçåäæåâ%sâã"
 
-#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsafpserver.c:1058
+#: ../daemon/gvfsafpserver.c:676 ../daemon/gvfsafpserver.c:701
+#, c-format
+msgid "The server â%sâ doesn't support anonymous access."
+msgstr "äæåâ%sâäææååçåã"
+
+#: ../daemon/gvfsafpserver.c:729
+#, c-format
+msgid ""
+"Unable to connect to the server â%sâ. No suitable authentication mechanism "
+"was found."
+msgstr "çæéçåäæåâ%sâãæäååéçéèæåã"
+
+#: ../daemon/gvfsafpserver.c:803
+#, 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
+#, c-format
+msgid "Permission denied."
+msgstr "æéèæçã"
+
+#: ../daemon/gvfsafpserver.c:919
+#, c-format
+msgid "The command is not supported by the server."
+msgstr "äæåäæææäã"
+
+#: ../daemon/gvfsafpserver.c:923
+#, c-format
+msgid "Your password has expired."
+msgstr "æçåçåéæã"
+
+#: ../daemon/gvfsafpserver.c:927
 #, c-format
-msgid "Enter password for afp as %s on %s"
-msgstr "èå %s å %s äç afp åç "
+msgid "Your password needs to be changed."
+msgstr "æçåçéèèæã"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:1061
+#: ../daemon/gvfsafpserver.c:1070
 #, c-format
-msgid "Enter password for afp on %s"
-msgstr "èå %s ç afp åç "
+msgid "Enter your password for the server â%sâ."
+msgstr "èååäæåâ%sâäçåçã"
 
-#: ../daemon/gvfsafpserver.c:1093
-#: ../daemon/gvfsbackendftp.c:518
-#: ../daemon/gvfsbackendsftp.c:984
-#: ../daemon/gvfsbackendsmbbrowse.c:995
-#: ../daemon/gvfsbackendsmb.c:619
-msgid "Password dialog cancelled"
-msgstr "åçåèçåèåæ"
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:1073
+#, c-format
+msgid "Enter your name and password for the server â%sâ."
+msgstr "èåæåäæåâ%sâäçåçèåçã"
 
-#: ../daemon/gvfsafpserver.c:1210
-msgid "Failed to logout from server"
-msgstr "çæåäæåçå"
+#: ../daemon/gvfsafpserver.c:1105
+msgid "The password prompt was cancelled."
+msgstr "åçæçååæã"
+
+#: ../daemon/gvfsafpserver.c:1222
+msgid "Unable to disconnect from the server."
+msgstr "çæåäæåæçã"
+
+#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1666
+#: ../daemon/gvfsafpserver.c:1757
+#, c-format
+msgid "Unable to connect to the server. A communication problem occurred."
+msgstr "çæéçåäæåãççéèåéã"
 
-#: ../daemon/gvfsafpserver.c:1699
-msgid "ID not found"
-msgstr "æäå ID"
+#: ../daemon/gvfsafpserver.c:1713
+msgid "Identification not found."
+msgstr "æäåèåèèã"
 
 #: ../daemon/gvfsafputils.c:124
 #, c-format
@@ -384,42 +344,37 @@ msgstr "ååäæçéèäç %d äèäæå"
 msgid "Couldn't mount AFP volume %s on %s"
 msgstr "çæå AFP ååå %s æèå %s"
 
-#: ../daemon/gvfsafpvolume.c:394
-#: ../daemon/gvfsafpvolume.c:1721
-#: ../daemon/gvfsafpvolume.c:2513
-#: ../daemon/gvfsbackendafc.c:968
-#: ../daemon/gvfsbackendafpbrowse.c:190
-#: ../daemon/gvfsbackendafpbrowse.c:323
-#: ../daemon/gvfsbackendafpbrowse.c:355
-#: ../daemon/gvfsbackendarchive.c:647
-#: ../daemon/gvfsbackendarchive.c:695
-#: ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776
-#: ../daemon/gvfsbackendcdda.c:1011
-#: ../daemon/gvfsbackendcomputer.c:627
-#: ../daemon/gvfsbackenddnssd.c:398
-#: ../daemon/gvfsbackendftp.c:1067
-#: ../daemon/gvfsbackendnetwork.c:602
-#: ../daemon/gvfsbackendsmbbrowse.c:1094
-#: ../daemon/gvfsbackendsmbbrowse.c:1161
-#: ../daemon/gvfsbackendsmbbrowse.c:1333
-#: ../daemon/gvfsbackendsmbbrowse.c:1403
+#: ../daemon/gvfsafpvolume.c:390 ../daemon/gvfsafpvolume.c:668
+#: ../daemon/gvfsafpvolume.c:821 ../daemon/gvfsafpvolume.c:1015
+#: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsafpvolume.c:1398
+#: ../daemon/gvfsafpvolume.c:1555 ../daemon/gvfsafpvolume.c:2001
+#: ../daemon/gvfsafpvolume.c:2127 ../daemon/gvfsafpvolume.c:2289
+#: ../daemon/gvfsafpvolume.c:2509 ../daemon/gvfsbackendafc.c:286
+#: ../daemon/gvfsbackendsftp.c:311 ../daemon/gvfsbackendsftp.c:1834
+#: ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "æéäè"
+
+#: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721
+#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:974
+#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:323
+#: ../daemon/gvfsbackendafpbrowse.c:355 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:1011
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:678
+#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
+#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "ææäåå"
 
-#: ../daemon/gvfsafpvolume.c:398
-#: ../daemon/gvfsafpvolume.c:468
-#: ../daemon/gvfsafpvolume.c:2517
-#: ../daemon/gvfsbackendafp.c:277
-#: ../daemon/gvfsbackendafp.c:478
-#: ../daemon/gvfsbackendafp.c:1310
-#: ../daemon/gvfsbackenddav.c:2241
-#: ../daemon/gvfsbackendftp.c:773
-#: ../daemon/gvfsbackendsftp.c:2332
-#: ../daemon/gvfsbackendsftp.c:3068
-#: ../daemon/gvfsbackendsftp.c:3407
-#: ../daemon/gvfsbackendsftp.c:4275
+#: ../daemon/gvfsafpvolume.c:398 ../daemon/gvfsafpvolume.c:468
+#: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafp.c:277
+#: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1310
+#: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
 msgid "File is directory"
 msgstr "æææçé"
 
@@ -427,15 +382,12 @@ msgstr "æææçé"
 msgid "Too many files open"
 msgstr "éåäååææ"
 
-#: ../daemon/gvfsafpvolume.c:672
-#: ../daemon/gvfsafpvolume.c:829
+#: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:829
 msgid "Target file is open"
 msgstr "çæææåéå"
 
-#: ../daemon/gvfsafpvolume.c:676
-#: ../daemon/gvfsbackendburn.c:420
-#: ../daemon/gvfsbackenddav.c:2590
-#: ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:420
+#: ../daemon/gvfsbackenddav.c:2590 ../daemon/gvfsbackendsftp.c:1828
 msgid "Directory not empty"
 msgstr "çéäæçç"
 
@@ -443,47 +395,34 @@ msgstr "çéäæçç"
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "çæçäèæèçäèåé (æååé)"
 
-#: ../daemon/gvfsafpvolume.c:684
-#: ../daemon/gvfsafpvolume.c:1231
+#: ../daemon/gvfsafpvolume.c:684 ../daemon/gvfsafpvolume.c:1231
 #: ../daemon/gvfsafpvolume.c:2131
 msgid "Target object doesn't exist"
 msgstr "çæçääåå"
 
-#: ../daemon/gvfsafpvolume.c:688
-#: ../daemon/gvfsafpvolume.c:841
-#: ../daemon/gvfsafpvolume.c:1035
-#: ../daemon/gvfsafpvolume.c:1235
+#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsafpvolume.c:841
+#: ../daemon/gvfsafpvolume.c:1035 ../daemon/gvfsafpvolume.c:1235
 #: ../daemon/gvfsafpvolume.c:2135
 msgid "Volume is read-only"
 msgstr "åååæåè"
 
-#: ../daemon/gvfsafpvolume.c:825
-#: ../daemon/gvfsafpvolume.c:1019
-#: ../daemon/gvfsafpvolume.c:1567
-#: ../daemon/gvfsafpvolume.c:2005
+#: ../daemon/gvfsafpvolume.c:825 ../daemon/gvfsafpvolume.c:1019
+#: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsafpvolume.c:2005
 #: ../daemon/gvfsafpvolume.c:2647
 msgid "Not enough space on volume"
 msgstr "åååäææèåççé"
 
-#: ../daemon/gvfsafpvolume.c:833
-#: ../daemon/gvfsafpvolume.c:1414
-#: ../daemon/gvfsafpvolume.c:1571
-#: ../daemon/gvfsbackendafp.c:284
-#: ../daemon/gvfsbackendafp.c:485
-#: ../daemon/gvfsbackenddav.c:2297
-#: ../daemon/gvfsbackenddav.c:2550
-#: ../daemon/gvfsbackenddav.c:2661
-#: ../daemon/gvfsbackendftp.c:752
-#: ../daemon/gvfsbackendftp.c:933
-#: ../daemon/gvfsbackendftp.c:1372
-#: ../daemon/gvfsbackendftp.c:1552
-#: ../daemon/gvfsbackendsftp.c:4284
-#: ../daemon/gvfsbackendsmb.c:2082
+#: ../daemon/gvfsafpvolume.c:833 ../daemon/gvfsafpvolume.c:1414
+#: ../daemon/gvfsafpvolume.c:1571 ../daemon/gvfsbackendafp.c:284
+#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2297
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackenddav.c:2661
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
 msgid "Target file already exists"
 msgstr "çæææååå"
 
-#: ../daemon/gvfsafpvolume.c:837
-#: ../daemon/gvfsafpvolume.c:1027
+#: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1027
 msgid "Ancestor directory doesn't exist"
 msgstr "äåçéäåå"
 
@@ -495,8 +434,7 @@ msgstr "åååæåååääææçé"
 msgid "Target directory already exists"
 msgstr "çæçéååå"
 
-#: ../daemon/gvfsafpvolume.c:1219
-#: ../daemon/gvfsbackendafp.c:590
+#: ../daemon/gvfsafpvolume.c:1219 ../daemon/gvfsbackendafp.c:590
 msgid "Can't rename volume"
 msgstr "äèéæååååå"
 
@@ -572,8 +510,7 @@ msgstr "ææäæäèåæééå"
 msgid "Internal Apple File Control error"
 msgstr "åéç Apple æææååéè"
 
-#: ../daemon/gvfsbackendafc.c:213
-#: ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "ææäåå"
 
@@ -624,7 +561,9 @@ msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice éèïçæçåæ"
 
 #: ../daemon/gvfsbackendafc.c:314
-msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly."
+msgid ""
+"libimobiledevice Error: No device found. Make sure usbmuxd is set up "
+"correctly."
 msgstr "libimobiledevice éèïæäåèçãèçå usbmuxd åæçèåã"
 
 #: ../daemon/gvfsbackendafc.c:318
@@ -632,46 +571,39 @@ msgstr "libimobiledevice éèïæäåèçãèçå usbmuxd åæç
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "æèçç libimobiledevice éè (%d)"
 
-#: ../daemon/gvfsbackendafc.c:410
+#: ../daemon/gvfsbackendafc.c:416
 msgid "Try again"
 msgstr "åèäæ"
 
-#: ../daemon/gvfsbackendafc.c:410
-#: ../daemon/gvfsbackend.c:939
-#: ../monitor/gdu/ggdudrive.c:1024
-#: ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackendafc.c:416 ../daemon/gvfsbackend.c:939
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:736
 msgid "Cancel"
 msgstr "åæ"
 
-#: ../daemon/gvfsbackendafc.c:428
-#: ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579
-#: ../daemon/gvfsbackenddav.c:1820
-#: ../daemon/gvfsbackendhttp.c:309
-#: ../daemon/gvfsbackendobexftp.c:862
-#: ../daemon/gvfsbackendobexftp.c:878
-#: ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendafc.c:434 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1820
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "çæçæèèæ"
 
-#: ../daemon/gvfsbackendafc.c:434
-#: ../daemon/gvfsbackendafc.c:464
+#: ../daemon/gvfsbackendafc.c:440 ../daemon/gvfsbackendafc.c:470
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "çæç AFC äçïåéç afc://uuid:port-number æå"
 
-#: ../daemon/gvfsbackendafc.c:450
+#: ../daemon/gvfsbackendafc.c:456
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple Mobile Device"
 
-#: ../daemon/gvfsbackendafc.c:455
+#: ../daemon/gvfsbackendafc.c:461
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Apple Mobile Device, åèç"
 
-#: ../daemon/gvfsbackendafc.c:460
+#: ../daemon/gvfsbackendafc.c:466
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple Mobile Device äçæä"
@@ -679,7 +611,7 @@ msgstr "Apple Mobile Device äçæä"
 #. translators:
 #. * This is the device name, with the service being browsed in brackets, eg.:
 #. * Alan Smithee's iPhone (jailbreak)
-#: ../daemon/gvfsbackendafc.c:519
+#: ../daemon/gvfsbackendafc.c:525
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (èç)"
@@ -687,8 +619,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:526
-#: ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:532 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "%s äçæä"
@@ -696,45 +627,37 @@ 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:618
-#, c-format
-msgid "The device '%s' is locked. Enter the passcode on the device and click 'Try again'."
-msgstr "èçã%sãåéåãèèåèççåçåæäãåèäæãã"
-
-#: ../daemon/gvfsbackendafc.c:958
-#: ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645
-#: ../daemon/gvfsbackendgphoto2.c:1810
-#: ../daemon/gvfsbackendobexftp.c:1071
-#: ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:718
-#: ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:624
+#, c-format
+msgid ""
+"The device â%sâ is locked. Enter the passcode on the device and click âTry "
+"againâ."
+msgstr "èçâ%sâåéåãèèåèççåçåæäâåèäæâã"
+
+#: ../daemon/gvfsbackendafc.c:964 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1810
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendrecent.c:121
+#: ../daemon/gvfsbackendsmb.c:718 ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "äèéåçé"
 
-#: ../daemon/gvfsbackendafc.c:1159
-#: ../daemon/gvfsbackendafc.c:2502
+#: ../daemon/gvfsbackendafc.c:1165 ../daemon/gvfsbackendafc.c:2508
 msgid "Backups are not yet supported."
 msgstr "åæææåäã"
 
-#: ../daemon/gvfsbackendafc.c:1331
+#: ../daemon/gvfsbackendafc.c:1337
 msgid "Invalid seek type"
 msgstr "çæçæåéå"
 
-#: ../daemon/gvfsbackendafc.c:2339
-#: ../daemon/gvfsbackendafp.c:1749
-#: ../daemon/gvfsbackendftp.c:1087
-#: ../daemon/gvfsbackendftp.c:1135
-#: ../daemon/gvfsbackendftp.c:1156
-#: ../daemon/gvfsbackendsftp.c:1831
-#: ../daemon/gvfsbackendsftp.c:4632
-#: ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsbackendafc.c:2345 ../daemon/gvfsbackendafp.c:1749
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
 #: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "æääèææ"
 
-#: ../daemon/gvfsbackendafpbrowse.c:218
-#: ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1089
 #: ../daemon/gvfsbackendsmbbrowse.c:1135
 msgid "The file is not a mountable"
 msgstr "èæææçææèç"
@@ -751,41 +674,32 @@ msgstr "AFP ååå %s æ %s"
 msgid "AFP volumes on %s"
 msgstr "AFP åååæ %s"
 
-#: ../daemon/gvfsbackendafpbrowse.c:489
-#: ../daemon/gvfsbackendafp.c:2097
-#: ../daemon/gvfsbackendarchive.c:539
-#: ../daemon/gvfsbackendftp.c:667
-#: ../daemon/gvfsbackendsftp.c:1744
+#: ../daemon/gvfsbackendafpbrowse.c:489 ../daemon/gvfsbackendafp.c:2097
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
 msgid "No hostname specified"
 msgstr "ææåäæåç"
 
-#: ../daemon/gvfsbackendafpbrowse.c:559
-#: ../daemon/gvfsbackendafp.c:2188
+#: ../daemon/gvfsbackendafpbrowse.c:559 ../daemon/gvfsbackendafp.c:2188
 msgid "Apple Filing Protocol Service"
 msgstr "Apple Filing Protocol Service"
 
-#: ../daemon/gvfsbackendafp.c:274
-#: ../daemon/gvfsbackendburn.c:871
-#: ../daemon/gvfsbackendftp.c:1544
-#: ../daemon/gvfsbackendobexftp.c:1779
+#: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:871
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
 msgid "Can't copy directory over directory"
 msgstr "äèåçéèèåçéä"
 
-#: ../daemon/gvfsbackendafp.c:293
-#: ../daemon/gvfsbackendburn.c:887
-#: ../daemon/gvfsbackendftp.c:1567
-#: ../daemon/gvfsbackendobexftp.c:1794
+#: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:887
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
 msgid "Can't recursively copy directory"
 msgstr "äèéåèèçé"
 
-#: ../daemon/gvfsbackendafp.c:475
-#: ../daemon/gvfsbackendsftp.c:4270
+#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4271
 #: ../daemon/gvfsbackendsmb.c:2071
 msgid "Can't move directory over directory"
 msgstr "äèåçéçåèçéä"
 
-#: ../daemon/gvfsbackendafp.c:1229
-#: ../daemon/gvfsbackendafp.c:1328
+#: ../daemon/gvfsbackendafp.c:1229 ../daemon/gvfsbackendafp.c:1328
 msgid "backups not supported"
 msgstr "äææåä"
 
@@ -794,16 +708,13 @@ msgstr "äææåä"
 msgid "Unable to create temporary file (%s)"
 msgstr "çæåçæåæ (%s)"
 
-#: ../daemon/gvfsbackendafp.c:1317
-#: ../daemon/gvfsbackenddav.c:2370
-#: ../daemon/gvfsbackendsftp.c:3420
-#: ../daemon/gvfsbackendsmb.c:1148
+#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2370
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
 msgid "The file was externally modified"
 msgstr "èææåèåéçåäæé"
 
-#: ../daemon/gvfsbackendafp.c:1733
-#: ../daemon/gvfsbackendftp.c:1128
-#: ../daemon/gvfsbackendsftp.c:4642
+#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "çæçåæéå (éæç unit32)"
 
@@ -826,21 +737,16 @@ 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:330
-#: ../daemon/gvfsbackendsftp.c:2268
+#: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ æ %s"
 
-#: ../daemon/gvfsbackendarchive.c:785
-#: ../daemon/gvfsbackendburn.c:675
-#: ../daemon/gvfsbackendcomputer.c:715
-#: ../daemon/gvfsbackenddnssd.c:445
-#: ../daemon/gvfsbackendftp.c:351
-#: ../daemon/gvfsbackendnetwork.c:648
-#: ../daemon/gvfsbackendsftp.c:3880
-#: ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:675
+#: ../daemon/gvfsbackendcomputer.c:715 ../daemon/gvfsbackenddnssd.c:445
+#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:724
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "èææäæçé"
 
@@ -853,32 +759,21 @@ msgstr "çé"
 msgid "Unable to create temporary directory"
 msgstr "çæåçæåçé"
 
-#: ../daemon/gvfsbackendburn.c:400
-#: ../daemon/gvfsbackendburn.c:411
-#: ../daemon/gvfsbackendburn.c:446
-#: ../daemon/gvfsbackendburn.c:667
-#: ../daemon/gvfsbackendburn.c:712
-#: ../daemon/gvfsbackendburn.c:738
-#: ../daemon/gvfsbackendburn.c:776
-#: ../daemon/gvfsbackendburn.c:967
-#: ../daemon/gvfsbackendburn.c:1003
-#: ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1205
-#: ../daemon/gvfsbackendgphoto2.c:2131
-#: ../daemon/gvfsbackendgphoto2.c:2854
-#: ../daemon/gvfsbackendrecent.c:105
-#: ../daemon/gvfsbackendrecent.c:259
-#: ../daemon/gvfsbackendsftp.c:1835
-#: ../daemon/gvfsbackendsftp.c:2948
-#: ../daemon/gvfsbackendsftp.c:2961
-#: ../daemon/gvfsbackendsftp.c:2981
-#: ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:400 ../daemon/gvfsbackendburn.c:411
+#: ../daemon/gvfsbackendburn.c:446 ../daemon/gvfsbackendburn.c:667
+#: ../daemon/gvfsbackendburn.c:712 ../daemon/gvfsbackendburn.c:738
+#: ../daemon/gvfsbackendburn.c:776 ../daemon/gvfsbackendburn.c:967
+#: ../daemon/gvfsbackendburn.c:1003 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1205 ../daemon/gvfsbackendgphoto2.c:2131
+#: ../daemon/gvfsbackendgphoto2.c:2854 ../daemon/gvfsbackendrecent.c:105
+#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
+#: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "ææéåæææçé"
 
-#: ../daemon/gvfsbackendburn.c:454
-#: ../daemon/gvfsbackendburn.c:899
+#: ../daemon/gvfsbackendburn.c:454 ../daemon/gvfsbackendburn.c:899
 #: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "äèåææèèåçéä"
@@ -888,58 +783,34 @@ msgstr "äèåææèèåçéä"
 msgid "CD/DVD Creator"
 msgstr "CD/DVD èäçå"
 
-#: ../daemon/gvfsbackendburn.c:748
-#: ../daemon/gvfsbackendburn.c:784
-#: ../daemon/gvfsbackendburn.c:919
-#: ../daemon/gvfsbackendburn.c:981
-#: ../daemon/gvfsbackendburn.c:985
-#: ../daemon/gvfsbackendburn.c:995
+#: ../daemon/gvfsbackendburn.c:748 ../daemon/gvfsbackendburn.c:784
+#: ../daemon/gvfsbackendburn.c:919 ../daemon/gvfsbackendburn.c:981
+#: ../daemon/gvfsbackendburn.c:985 ../daemon/gvfsbackendburn.c:995
 #: ../daemon/gvfsbackendgphoto2.c:2928
 msgid "File exists"
 msgstr "ææååå"
 
-#: ../daemon/gvfsbackendburn.c:823
-#: ../daemon/gvfsjobcloseread.c:112
-#: ../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:266
-#: ../daemon/gvfsjobmakedirectory.c:108
-#: ../daemon/gvfsjobmount.c:112
-#: ../daemon/gvfsjobmountmountable.c:138
-#: ../daemon/gvfsjobmove.c:121
-#: ../daemon/gvfsjobopenforread.c:120
-#: ../daemon/gvfsjobopenforwrite.c:132
-#: ../daemon/gvfsjobopenforwrite.c:146
-#: ../daemon/gvfsjobopenforwrite.c:160
-#: ../daemon/gvfsjobopeniconforread.c:104
-#: ../daemon/gvfsjobpollmountable.c:107
-#: ../daemon/gvfsjobpull.c:125
-#: ../daemon/gvfsjobpush.c:125
-#: ../daemon/gvfsjobqueryattributes.c:145
-#: ../daemon/gvfsjobqueryfsinfo.c:116
-#: ../daemon/gvfsjobqueryinfo.c:124
-#: ../daemon/gvfsjobqueryinforead.c:119
-#: ../daemon/gvfsjobqueryinfowrite.c:119
-#: ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119
-#: ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:130
-#: ../daemon/gvfsjobsetdisplayname.c:111
-#: ../daemon/gvfsjobstartmountable.c:113
-#: ../daemon/gvfsjobstopmountable.c:115
-#: ../daemon/gvfsjobtrash.c:107
-#: ../daemon/gvfsjobunmountmountable.c:157
-#: ../daemon/gvfsjobunmountmountable.c:172
-#: ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1174
-#: ../monitor/gdu/ggdumount.c:1258
-#: ../monitor/gdu/ggduvolume.c:1617
-#: ../monitor/udisks2/gvfsudisks2mount.c:1108
+#: ../daemon/gvfsbackendburn.c:823 ../daemon/gvfsjobcloseread.c:112
+#: ../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:268
+#: ../daemon/gvfsjobmakedirectory.c:108 ../daemon/gvfsjobmount.c:112
+#: ../daemon/gvfsjobmountmountable.c:138 ../daemon/gvfsjobmove.c:121
+#: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:132
+#: ../daemon/gvfsjobopenforwrite.c:146 ../daemon/gvfsjobopenforwrite.c:160
+#: ../daemon/gvfsjobopeniconforread.c:104 ../daemon/gvfsjobpollmountable.c:107
+#: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125
+#: ../daemon/gvfsjobqueryattributes.c:145 ../daemon/gvfsjobqueryfsinfo.c:116
+#: ../daemon/gvfsjobqueryinfo.c:124 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
+#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobsetattribute.c:130 ../daemon/gvfsjobsetdisplayname.c:111
+#: ../daemon/gvfsjobstartmountable.c:113 ../daemon/gvfsjobstopmountable.c:115
+#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobunmountmountable.c:157
+#: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258
+#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1108
 #: ../monitor/udisks2/gvfsudisks2volume.c:1566
 msgid "Operation not supported by backend"
 msgstr "åçäææææä"
@@ -948,31 +819,24 @@ msgstr "åçäææææä"
 msgid "No such file or directory in target path"
 msgstr "åçæèåææéåæææçé"
 
-#: ../daemon/gvfsbackendburn.c:880
-#: ../daemon/gvfsbackendobexftp.c:1787
-#: ../daemon/gvfsbackendobexftp.c:1818
-#: ../daemon/gvfsbackendsftp.c:1829
-#: ../daemon/gvfsbackendsftp.c:4440
+#: ../daemon/gvfsbackendburn.c:880 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "çæææååå"
 
-#: ../daemon/gvfsbackendburn.c:945
-#: ../daemon/gvfsbackendcomputer.c:795
-#: ../daemon/gvfsbackendgphoto2.c:2504
-#: ../daemon/gvfsbackendgphoto2.c:2717
-#: ../daemon/gvfsbackendgphoto2.c:2814
-#: ../daemon/gvfsbackendgphoto2.c:2907
+#: ../daemon/gvfsbackendburn.c:945 ../daemon/gvfsbackendcomputer.c:795
+#: ../daemon/gvfsbackendgphoto2.c:2504 ../daemon/gvfsbackendgphoto2.c:2717
+#: ../daemon/gvfsbackendgphoto2.c:2814 ../daemon/gvfsbackendgphoto2.c:2907
 msgid "Not supported"
 msgstr "äææ"
 
-#: ../daemon/gvfsbackend.c:938
-#: ../monitor/gdu/ggdumount.c:922
+#: ../daemon/gvfsbackend.c:938 ../monitor/gdu/ggdumount.c:922
 #: ../monitor/udisks2/gvfsudisks2mount.c:734
 msgid "Unmount Anyway"
 msgstr "åååè"
 
-#: ../daemon/gvfsbackend.c:941
-#: ../monitor/gdu/ggdumount.c:924
+#: ../daemon/gvfsbackend.c:941 ../monitor/gdu/ggdumount.c:924
 #: ../monitor/udisks2/gvfsudisks2mount.c:737
 msgid ""
 "Volume is busy\n"
@@ -981,28 +845,23 @@ msgstr ""
 "ååååçä\n"
 "äæååæççåæåäçèåååã"
 
-#: ../daemon/gvfsbackendcdda.c:354
-#: ../daemon/gvfsbackendgphoto2.c:1508
+#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1508
 msgid "Cannot create gudev client"
 msgstr "äèåç gudev åæç"
 
-#: ../daemon/gvfsbackendcdda.c:374
-#: ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1526
 msgid "Cannot connect to the system bus"
 msgstr "äèéçåççåææ"
 
-#: ../daemon/gvfsbackendcdda.c:385
-#: ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1538
 msgid "Cannot create libhal context"
 msgstr "äèåç libhal èç"
 
-#: ../daemon/gvfsbackendcdda.c:399
-#: ../daemon/gvfsbackendgphoto2.c:1551
+#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1551
 msgid "Cannot initialize libhal"
 msgstr "äèååå libhal"
 
-#: ../daemon/gvfsbackendcdda.c:415
-#: ../daemon/gvfsbackendcdda.c:500
+#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:500
 msgid "No drive specified"
 msgstr "ææåèç"
 
@@ -1023,12 +882,9 @@ msgstr "èç %s ääååéæææ"
 msgid "cdda mount on %s"
 msgstr "cdda æèæ %s"
 
-#: ../daemon/gvfsbackendcdda.c:463
-#: ../daemon/gvfsbackendcdda.c:983
-#: ../monitor/gdu/ggduvolume.c:349
-#: ../monitor/hal/ghalmount.c:325
-#: ../monitor/hal/ghalvolume.c:225
-#: ../monitor/hal/ghalvolume.c:246
+#: ../daemon/gvfsbackendcdda.c:463 ../daemon/gvfsbackendcdda.c:983
+#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
+#: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #: ../monitor/udisks2/gvfsudisks2volume.c:308
 #, c-format
 msgid "Audio Disc"
@@ -1056,8 +912,7 @@ msgstr "äèçç %s äçãparanoiaãçéè"
 msgid "Error seeking in stream on drive %s"
 msgstr "åçç %s äæåäæççéè"
 
-#: ../daemon/gvfsbackendcdda.c:1004
-#: ../daemon/gvfsbackendgphoto2.c:1818
+#: ../daemon/gvfsbackendcdda.c:1004 ../daemon/gvfsbackendgphoto2.c:1818
 #, c-format
 msgid "No such file"
 msgstr "ææéåææ"
@@ -1071,8 +926,7 @@ msgstr "ææäååæäæéè"
 msgid "Audio CD File System Service"
 msgstr "éæ CD ææççæå"
 
-#: ../daemon/gvfsbackendcomputer.c:192
-#: ../daemon/gvfsbackendcomputer.c:757
+#: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:757
 msgid "Computer"
 msgstr "éè"
 
@@ -1084,14 +938,12 @@ msgstr "ææçç"
 msgid "Can't open mountable file"
 msgstr "äèéååæèåææ"
 
-#: ../daemon/gvfsbackendcomputer.c:841
-#: ../daemon/gvfsbackendsftp.c:1162
+#: ../daemon/gvfsbackendcomputer.c:841 ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "åéçéèï%s"
 
-#: ../daemon/gvfsbackendcomputer.c:873
-#: ../daemon/gvfsbackendcomputer.c:992
+#: ../daemon/gvfsbackendcomputer.c:873 ../daemon/gvfsbackendcomputer.c:992
 msgid "Can't mount file"
 msgstr "äèæèææ"
 
@@ -1099,12 +951,9 @@ msgstr "äèæèææ"
 msgid "No medium in the drive"
 msgstr "èçäææåé"
 
-#: ../daemon/gvfsbackendcomputer.c:942
-#: ../daemon/gvfsbackendcomputer.c:1037
-#: ../daemon/gvfsbackendcomputer.c:1143
-#: ../daemon/gvfsbackendcomputer.c:1233
-#: ../daemon/gvfsbackendcomputer.c:1306
-#: ../daemon/gvfsbackendcomputer.c:1375
+#: ../daemon/gvfsbackendcomputer.c:942 ../daemon/gvfsbackendcomputer.c:1037
+#: ../daemon/gvfsbackendcomputer.c:1143 ../daemon/gvfsbackendcomputer.c:1233
+#: ../daemon/gvfsbackendcomputer.c:1306 ../daemon/gvfsbackendcomputer.c:1375
 msgid "Not a mountable file"
 msgstr "äæåæèåææ"
 
@@ -1116,18 +965,15 @@ msgstr "äèåèææ"
 msgid "Can't eject file"
 msgstr "äèéåææ"
 
-#: ../daemon/gvfsbackendcomputer.c:1253
-#: ../daemon/gvfsbackendcomputer.c:1260
-msgid "Can't start file"
-msgstr "äèéåææ"
+#: ../daemon/gvfsbackendcomputer.c:1253 ../daemon/gvfsbackendcomputer.c:1260
+msgid "Can't start drive"
+msgstr "äèååèç"
 
-#: ../daemon/gvfsbackendcomputer.c:1326
-#: ../daemon/gvfsbackendcomputer.c:1333
-msgid "Can't stop file"
-msgstr "äèééææ"
+#: ../daemon/gvfsbackendcomputer.c:1326 ../daemon/gvfsbackendcomputer.c:1333
+msgid "Can't stop drive"
+msgstr "äèåæèç"
 
-#: ../daemon/gvfsbackendcomputer.c:1390
-#: ../daemon/gvfsbackendcomputer.c:1397
+#: ../daemon/gvfsbackendcomputer.c:1390 ../daemon/gvfsbackendcomputer.c:1397
 msgid "Can't poll file"
 msgstr "äèçæææ"
 
@@ -1147,8 +993,7 @@ msgstr "WebDAV ä %s æ %s%s"
 msgid "WebDAV on %s%s"
 msgstr "WebDAV æ %s%s"
 
-#: ../daemon/gvfsbackenddav.c:680
-#: ../daemon/gvfsbackenddav.c:1910
+#: ../daemon/gvfsbackenddav.c:680 ../daemon/gvfsbackenddav.c:1910
 #: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
@@ -1166,10 +1011,8 @@ msgstr "çççåæ"
 msgid "Unexpected reply from server"
 msgstr "äèäæåæéæçåæ"
 
-#: ../daemon/gvfsbackenddav.c:1394
-#: ../daemon/gvfsbackenddav.c:2039
-#: ../daemon/gvfsbackenddav.c:2126
-#: ../daemon/gvfsbackenddav.c:2233
+#: ../daemon/gvfsbackenddav.c:1394 ../daemon/gvfsbackenddav.c:2039
+#: ../daemon/gvfsbackenddav.c:2126 ../daemon/gvfsbackenddav.c:2233
 msgid "Response invalid"
 msgstr "åæçæ"
 
@@ -1186,32 +1029,26 @@ msgstr "èå %s çåç "
 msgid "Please enter proxy password"
 msgstr "èèåäçäæååç"
 
-#: ../daemon/gvfsbackenddav.c:1914
-#: ../daemon/gvfsbackenddav.c:1918
+#: ../daemon/gvfsbackenddav.c:1914 ../daemon/gvfsbackenddav.c:1918
 msgid "Not a WebDAV enabled share"
 msgstr "äæäç WebDAV çåä"
 
-#: ../daemon/gvfsbackenddav.c:1993
-#: ../daemon/gvfsbackenddav.c:2081
-#: ../daemon/gvfsbackenddav.c:2154
-#: ../daemon/gvfsbackenddav.c:2267
+#: ../daemon/gvfsbackenddav.c:1993 ../daemon/gvfsbackenddav.c:2081
+#: ../daemon/gvfsbackenddav.c:2154 ../daemon/gvfsbackenddav.c:2267
 msgid "Could not create request"
 msgstr "çæåçèæ"
 
-#: ../daemon/gvfsbackenddav.c:2401
-#: ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "åçåäææåæ"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:492
-#: ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:447
 msgid "Local Network"
 msgstr "æåççè"
 
-#: ../daemon/gvfsbackenddnssd.c:736
-#: ../daemon/gvfsbackendnetwork.c:752
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:828
 msgid "Can't monitor file or directory."
 msgstr "äèçææææçéã"
 
@@ -1220,10 +1057,8 @@ msgstr "äèçææææçéã"
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:755
-#: ../daemon/gvfsbackendnetwork.c:687
-#: ../daemon/gvfsbackendnetwork.c:819
-#: ../daemon/gvfsbackendnetwork.c:820
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:763
+#: ../daemon/gvfsbackendnetwork.c:895 ../daemon/gvfsbackendnetwork.c:896
 msgid "Network"
 msgstr "çè"
 
@@ -1239,6 +1074,11 @@ msgstr "èå %s å %s äç FTP åç "
 msgid "Enter password for FTP on %s"
 msgstr "èå %s ç FTP åç "
 
+#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:985
+#: ../daemon/gvfsbackendsmbbrowse.c:995 ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "åçåèçåèåæ"
+
 #: ../daemon/gvfsbackendftp.c:630
 #, c-format
 msgid "FTP on %s"
@@ -1254,9 +1094,8 @@ msgstr "ä %s çå %s ç FTP"
 msgid "Insufficient permissions"
 msgstr "æéäè"
 
-#: ../daemon/gvfsbackendftp.c:981
-#: ../daemon/gvfsbackendftp.c:1335
-#: ../daemon/gvfsbackendsftp.c:3273
+#: ../daemon/gvfsbackendftp.c:981 ../daemon/gvfsbackendftp.c:1335
+#: ../daemon/gvfsbackendsftp.c:3274
 msgid "backups not supported yet"
 msgstr "åäåæææ"
 
@@ -1281,16 +1120,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%sï%dïäææ"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:718
-#: ../daemon/gvfsbackendgphoto2.c:724
+#: ../daemon/gvfsbackendgphoto2.c:718 ../daemon/gvfsbackendgphoto2.c:724
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "æäçæ (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:947
-#: ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:947 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1298,21 +1135,18 @@ msgstr "%s ççæ"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:950
-#: ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:950 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s éææææ"
 
-#: ../daemon/gvfsbackendgphoto2.c:959
-#: ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "ççæ"
 
-#: ../daemon/gvfsbackendgphoto2.c:961
-#: ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "éææææ"
 
@@ -1328,8 +1162,7 @@ msgstr "äèåç gphoto2 èç"
 msgid "Error creating camera"
 msgstr "åçæåæççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611
-#: ../daemon/gvfsbackendgphoto2.c:1621
+#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendgphoto2.c:1621
 msgid "Error loading device information"
 msgstr "èåèçèèæççéè"
 
@@ -1377,14 +1210,12 @@ msgstr "åææååèææççéè"
 msgid "Malformed icon identifier '%s'"
 msgstr "åçèåçã%sãæåäè"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
-#: ../daemon/gvfsbackendgphoto2.c:3178
+#: ../daemon/gvfsbackendgphoto2.c:1985 ../daemon/gvfsbackendgphoto2.c:3178
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "åæåæ %s äæåäæççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:2125
-#: ../daemon/gvfsbackendsftp.c:2951
+#: ../daemon/gvfsbackendgphoto2.c:2125 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "äæäåçé"
@@ -1405,18 +1236,15 @@ msgstr "åççéæççéè"
 msgid "Name already exists"
 msgstr "åçååå"
 
-#: ../daemon/gvfsbackendgphoto2.c:2740
-#: ../daemon/gvfsbackendgphoto2.c:3373
+#: ../daemon/gvfsbackendgphoto2.c:2740 ../daemon/gvfsbackendgphoto2.c:3373
 msgid "New name too long"
 msgstr "æçåçåé"
 
-#: ../daemon/gvfsbackendgphoto2.c:2750
-#: ../daemon/gvfsbackendgphoto2.c:3384
+#: ../daemon/gvfsbackendgphoto2.c:2750 ../daemon/gvfsbackendgphoto2.c:3384
 msgid "Error renaming directory"
 msgstr "éæååçéççéè"
 
-#: ../daemon/gvfsbackendgphoto2.c:2763
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:2763 ../daemon/gvfsbackendgphoto2.c:3397
 msgid "Error renaming file"
 msgstr "éæååæææççéè"
 
@@ -1458,15 +1286,19 @@ msgid "Not supported (not same directory)"
 msgstr "äææïäåçéï"
 
 #: ../daemon/gvfsbackendgphoto2.c:3341
-msgid "Not supported (the source is a directory, the destination is a directory too)"
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
 msgstr "äææ (äææçéïççäæçé)"
 
 #: ../daemon/gvfsbackendgphoto2.c:3349
-msgid "Not supported (the source is a directory, but the destination is an existing file)"
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
 msgstr "äææ (äææçéïççæçæçææ)"
 
 #: ../daemon/gvfsbackendgphoto2.c:3361
-msgid "Not supported (the source is a file, but the destination is a directory)"
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
 msgstr "äææ (äææææïççæçé)"
 
 #: ../daemon/gvfsbackendhttp.c:251
@@ -1478,15 +1310,22 @@ msgstr "HTTP åæçéèï%s"
 msgid "Directory notification not supported"
 msgstr "äææçééç"
 
+#: ../daemon/gvfsbackendnetwork.c:159
+msgid "File Sharing"
+msgstr "ææåä"
+
+#: ../daemon/gvfsbackendnetwork.c:164
+msgid "Remote Login"
+msgstr "éççå"
+
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:247
-#: ../daemon/gvfsbackendsmbbrowse.c:894
+#: ../daemon/gvfsbackendnetwork.c:323 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "Windows çè"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:872
+#: ../daemon/gvfsbackendnetwork.c:948
 msgid "Network Location Monitor"
 msgstr "çèäççèå"
 
@@ -1496,8 +1335,7 @@ 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/gvfsbackendobexftp.c:682
-#: ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
@@ -1515,8 +1353,7 @@ msgstr "åèççéçååå"
 msgid "Device requires a software update"
 msgstr "èçèæææèé"
 
-#: ../daemon/gvfsbackendobexftp.c:1855
-#: ../daemon/gvfsbackendsmb.c:1973
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "åéæææççéèï%s"
@@ -1527,13 +1364,11 @@ msgstr "æèäçéçèæääèåé"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendrecent.c:547
-#: ../daemon/gvfsbackendrecent.c:658
+#: ../daemon/gvfsbackendrecent.c:547 ../daemon/gvfsbackendrecent.c:658
 msgid "Recent"
 msgstr "æèäç"
 
-#: ../daemon/gvfsbackendsftp.c:303
-#: ../daemon/gvfsbackendsftp.c:657
+#: ../daemon/gvfsbackendsftp.c:303 ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "ssh çåæåçäæä"
 
@@ -1553,156 +1388,137 @@ msgstr "éçèäæåæç"
 msgid "Host key verification failed"
 msgstr "éèäæééåæ"
 
-#: ../daemon/gvfsbackendsftp.c:501
+#: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
 msgstr "çæåå ssh çå"
 
-#: ../daemon/gvfsbackendsftp.c:517
+#: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "çæåå ssh çåï%s"
 
-#: ../daemon/gvfsbackendsftp.c:619
-#: ../daemon/gvfsbackendsftp.c:877
+#: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "çåéææé"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:957
+#: ../daemon/gvfsbackendsftp.c:958
 #, c-format
 msgid "Enter passphrase for key for ssh as %s on %s"
 msgstr "èå %s å %s äç ssh ééåè "
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:960
+#: ../daemon/gvfsbackendsftp.c:961
 #, c-format
 msgid "Enter password for ssh as %s on %s"
 msgstr "èå %s å %s äç ssh åç "
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:964
+#: ../daemon/gvfsbackendsftp.c:965
 #, c-format
 msgid "Enter passphrase for key for ssh on %s"
 msgstr "èåå %s äç ssh ééçåè"
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:967
+#: ../daemon/gvfsbackendsftp.c:968
 #, c-format
 msgid "Enter password for ssh on %s"
 msgstr "èåå %s äç ssh åè"
 
-#: ../daemon/gvfsbackendsftp.c:1047
+#: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
 msgstr "äèåéåç"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
 msgstr "ååçå"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
 msgstr "åæçå"
 
-#: ../daemon/gvfsbackendsftp.c:1064
+#: ../daemon/gvfsbackendsftp.c:1065
 #, c-format
 msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is %s. If you want to be absolutely "
+"sure it is safe to continue, contact the system administrator."
 msgstr ""
 "éçéè (%s) çèåäæã\n"
 "ééåççåæçäæçåéèçæåã\n"
 "\n"
 "çéçéèåéçèåç %sãåæææèååçåççæååçïèéçççççèã"
 
-#: ../daemon/gvfsbackendsftp.c:1084
+#: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
 msgstr "çååèçåèåæ"
 
-#: ../daemon/gvfsbackendsftp.c:1104
+#: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
 msgstr "äèåéäæèåçè"
 
-#: ../daemon/gvfsbackendsftp.c:1642
-#: ../daemon/gvfsbackendsftp.c:1665
+#: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
 msgstr "éèååéè"
 
 #. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1690
+#: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
 msgid "SFTP for %s on %s"
 msgstr "SFTP ä %s æ %s"
 
 #. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1693
+#: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
 msgid "SFTP on %s"
 msgstr "SFTP æ %s"
 
-#: ../daemon/gvfsbackendsftp.c:1734
+#: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "æäåææç ssh æä"
 
-#: ../daemon/gvfsbackendsftp.c:2008
-#: ../daemon/gvfsbackendsftp.c:2397
-#: ../daemon/gvfsbackendsftp.c:2476
-#: ../daemon/gvfsbackendsftp.c:2487
-#: ../daemon/gvfsbackendsftp.c:2543
-#: ../daemon/gvfsbackendsftp.c:2629
-#: ../daemon/gvfsbackendsftp.c:2679
-#: ../daemon/gvfsbackendsftp.c:2725
-#: ../daemon/gvfsbackendsftp.c:2800
-#: ../daemon/gvfsbackendsftp.c:2907
-#: ../daemon/gvfsbackendsftp.c:3024
-#: ../daemon/gvfsbackendsftp.c:3105
-#: ../daemon/gvfsbackendsftp.c:3177
-#: ../daemon/gvfsbackendsftp.c:3189
-#: ../daemon/gvfsbackendsftp.c:3245
-#: ../daemon/gvfsbackendsftp.c:3287
-#: ../daemon/gvfsbackendsftp.c:3472
-#: ../daemon/gvfsbackendsftp.c:3504
-#: ../daemon/gvfsbackendsftp.c:3559
-#: ../daemon/gvfsbackendsftp.c:3616
-#: ../daemon/gvfsbackendsftp.c:3913
-#: ../daemon/gvfsbackendsftp.c:3980
-#: ../daemon/gvfsbackendsftp.c:4113
-#: ../daemon/gvfsbackendsftp.c:4173
-#: ../daemon/gvfsbackendsftp.c:4208
-#: ../daemon/gvfsbackendsftp.c:4236
-#: ../daemon/gvfsbackendsftp.c:4344
-#: ../daemon/gvfsbackendsftp.c:4398
-#: ../daemon/gvfsbackendsftp.c:4437
-#: ../daemon/gvfsbackendsftp.c:4471
-#: ../daemon/gvfsbackendsftp.c:4505
-#: ../daemon/gvfsbackendsftp.c:4520
-#: ../daemon/gvfsbackendsftp.c:4535
-#: ../daemon/gvfsbackendsftp.c:4613
+#: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544 ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680 ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "æåçæçåæ"
 
-#: ../daemon/gvfsbackendsftp.c:2256
-#: ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr "ïçæçççï"
 
-#: ../daemon/gvfsbackendsftp.c:2341
+#: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
 msgstr "åæ"
 
-#: ../daemon/gvfsbackendsftp.c:2449
+#: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
 msgstr "OpenIconForRead äæçæç icon_id ã%sã"
 
-#: ../daemon/gvfsbackendsftp.c:2745
+#: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "åçåäæææççéèï%s"
 
-#: ../daemon/gvfsbackendsftp.c:3349
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "çæåçæåææ"
 
@@ -1738,8 +1554,7 @@ msgstr "Windows çèææççæå"
 msgid "Password required for share %s on %s"
 msgstr "èåä %2$s äç %1$s éèåç"
 
-#: ../daemon/gvfsbackendsmb.c:494
-#: ../daemon/gvfsbackendsmb.c:540
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "åéçéè (%s)"
@@ -1749,8 +1564,7 @@ msgstr "åéçéè (%s)"
 msgid "Failed to mount Windows share"
 msgstr "æè Windows åäåæ"
 
-#: ../daemon/gvfsbackendsmb.c:788
-#: ../daemon/gvfsbackendsmb.c:1284
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "äææçæåéå"
 
@@ -1785,20 +1599,17 @@ msgstr "äèåççåçé"
 msgid "Windows Shares File System Service"
 msgstr "Windows åäææççæå"
 
-#: ../daemon/gvfsbackendtrash.c:370
-#: ../daemon/gvfsbackendtrash.c:426
+#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "åæçèæääèåé"
 
-#: ../daemon/gvfsbackendtrash.c:387
-#: ../daemon/gvfsbackendtrash.c:440
+#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 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:755
-#: ../daemon/gvfsbackendtrash.c:863
+#: ../daemon/gvfsbackendtrash.c:755 ../daemon/gvfsbackendtrash.c:863
 msgid "Trash"
 msgstr "åæç"
 
@@ -1806,15 +1617,15 @@ msgstr "åæç"
 msgid "Unexpected end of stream"
 msgstr "æéæçäæçæ"
 
-#: ../daemon/gvfsftpconnection.c:196
-#: ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:411
-#: ../daemon/gvfsftptask.c:839
+#: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "çæçåæ"
 
 #: ../daemon/gvfsftpconnection.c:392
-msgid "Failed to create active FTP connection. Maybe your router does not support this?"
+msgid ""
+"Failed to create active FTP connection. Maybe your router does not support "
+"this?"
 msgstr "çæåçäçäç FTP éçãäèæçèçåäææåï"
 
 #: ../daemon/gvfsftpconnection.c:399
@@ -1845,8 +1656,7 @@ msgstr "çæéåèæéçãäèæçéççéæäåï"
 msgid "Data connection closed"
 msgstr "èæéçåéé"
 
-#: ../daemon/gvfsftptask.c:374
-#: ../daemon/gvfsftptask.c:378
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "æäååæ"
 
@@ -1874,14 +1684,12 @@ msgstr "åçäææçèéç"
 msgid "Invalid dbus message"
 msgstr "çæç dbus èæ"
 
-#: ../daemon/gvfsjobunmount.c:123
-#: ../monitor/udisks2/gvfsudisks2utils.c:805
+#: ../daemon/gvfsjobunmount.c:123 ../monitor/udisks2/gvfsudisks2utils.c:805
 #, c-format
 msgid "%s has been unmounted\n"
 msgstr "%s åèåè\n"
 
-#: ../daemon/gvfsjobunmount.c:141
-#: ../monitor/udisks2/gvfsudisks2utils.c:659
+#: ../daemon/gvfsjobunmount.c:141 ../monitor/udisks2/gvfsudisks2utils.c:659
 #, c-format
 msgid ""
 "Unmounting %s\n"
@@ -1894,8 +1702,7 @@ msgstr ""
 msgid "File system is busy"
 msgstr "ææççåçä"
 
-#: ../daemon/main.c:133
-#: ../metadata/meta-daemon.c:445
+#: ../daemon/main.c:133 ../metadata/meta-daemon.c:445
 msgid "Replace old daemon."
 msgstr "çæèçäæçåã"
 
@@ -1913,77 +1720,60 @@ msgstr "GCFS ääæçå"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:166
-#: ../metadata/meta-daemon.c:470
+#: ../daemon/main.c:166 ../metadata/meta-daemon.c:470
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:168
-#: ../metadata/meta-daemon.c:472
-#: ../programs/gvfs-cat.c:170
-#: ../programs/gvfs-cat.c:182
-#: ../programs/gvfs-copy.c:133
-#: ../programs/gvfs-info.c:387
-#: ../programs/gvfs-ls.c:416
-#: ../programs/gvfs-mime.c:97
-#: ../programs/gvfs-mime.c:107
-#: ../programs/gvfs-mime.c:114
-#: ../programs/gvfs-mkdir.c:71
-#: ../programs/gvfs-monitor-dir.c:126
-#: ../programs/gvfs-monitor-file.c:125
-#: ../programs/gvfs-mount.c:1036
-#: ../programs/gvfs-move.c:121
-#: ../programs/gvfs-open.c:78
-#: ../programs/gvfs-open.c:90
-#: ../programs/gvfs-rename.c:75
-#: ../programs/gvfs-rm.c:72
-#: ../programs/gvfs-save.c:175
-#: ../programs/gvfs-set-attribute.c:151
-#: ../programs/gvfs-trash.c:71
+#: ../daemon/main.c:168 ../metadata/meta-daemon.c:472
+#: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:182
+#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:389
+#: ../programs/gvfs-ls.c:416 ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:107 ../programs/gvfs-mime.c:114
+#: ../programs/gvfs-mkdir.c:71 ../programs/gvfs-monitor-dir.c:126
+#: ../programs/gvfs-monitor-file.c:125 ../programs/gvfs-mount.c:1036
+#: ../programs/gvfs-move.c:121 ../programs/gvfs-open.c:78
+#: ../programs/gvfs-open.c:90 ../programs/gvfs-rename.c:75
+#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:178
+#: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:71
 #: ../programs/gvfs-tree.c:262
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "äçã%s --helpãäçåæåèèã"
 
-#: ../daemon/mount.c:674
+#: ../daemon/mount.c:693
 #, c-format
 msgid "Automount failed: %s"
 msgstr "èåæèåæï%s"
 
-#: ../daemon/mount.c:718
-#: ../daemon/mount.c:779
+#: ../daemon/mount.c:737 ../daemon/mount.c:798
 msgid "The specified location is not mounted"
 msgstr "æåçäçåææè"
 
-#: ../daemon/mount.c:723
+#: ../daemon/mount.c:742
 msgid "The specified location is not supported"
 msgstr "æåçäçäèææ"
 
-#: ../daemon/mount.c:847
+#: ../daemon/mount.c:866
 msgid "Location is already mounted"
 msgstr "èäçåçæèä"
 
-#: ../daemon/mount.c:856
+#: ../daemon/mount.c:875
 msgid "Location is not mountable"
 msgstr "èäçäæåæèç"
 
-#: ../metadata/meta-daemon.c:133
-#: ../metadata/meta-daemon.c:253
-#: ../metadata/meta-daemon.c:302
-#: ../metadata/meta-daemon.c:337
+#: ../metadata/meta-daemon.c:133 ../metadata/meta-daemon.c:253
+#: ../metadata/meta-daemon.c:302 ../metadata/meta-daemon.c:337
 #: ../metadata/meta-daemon.c:373
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "æäåäçèæææ %s"
 
-#: ../metadata/meta-daemon.c:151
-#: ../metadata/meta-daemon.c:163
+#: ../metadata/meta-daemon.c:151 ../metadata/meta-daemon.c:163
 msgid "Unable to set metadata key"
 msgstr "çæèåäçèæçéå"
 
-#: ../metadata/meta-daemon.c:173
-#: ../metadata/meta-daemon.c:312
+#: ../metadata/meta-daemon.c:173 ../metadata/meta-daemon.c:312
 msgid "Unable to unset metadata key"
 msgstr "çæåæäçèæçèåé"
 
@@ -2007,24 +1797,20 @@ msgstr "GVFS çäçèæäæçå"
 msgid "GVfs GDU Volume Monitor"
 msgstr "GVfs GDU åååçæçå"
 
-#: ../monitor/gdu/ggdudrive.c:168
-#: ../monitor/hal/ghaldrive.c:179
+#: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
 msgstr "èçæ"
 
-#: ../monitor/gdu/ggdudrive.c:258
-#: ../monitor/udisks2/gvfsudisks2drive.c:200
+#: ../monitor/gdu/ggdudrive.c:258 ../monitor/udisks2/gvfsudisks2drive.c:200
 #, c-format
 msgid "Unnamed Drive (%s)"
 msgstr "æååççç (%s)"
 
-#: ../monitor/gdu/ggdudrive.c:260
-#: ../monitor/udisks2/gvfsudisks2drive.c:202
+#: ../monitor/gdu/ggdudrive.c:260 ../monitor/udisks2/gvfsudisks2drive.c:202
 msgid "Unnamed Drive"
 msgstr "æååççç"
 
-#: ../monitor/gdu/ggdudrive.c:561
-#: ../monitor/udisks2/gvfsudisks2drive.c:505
+#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:505
 #, c-format
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr "éååéåæïèåéäçäæåååååæååçã"
@@ -2032,17 +1818,18 @@ msgstr "éååéåæïèåéäçäæåååååæååçã
 #: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
-"Starting a drive in degraded mode means that the drive is no longer tolerant to failures. Data on the drive may be irrevocably lost if a component fails."
+"Starting a drive in degraded mode means that the drive is no longer tolerant "
+"to failures. Data on the drive may be irrevocably lost if a component fails."
 msgstr ""
 "æåäéçæåååèçï\n"
-"äéçæåååèçäèèèçåäåèåéãåææåäççéèïèçäçèæåèææéæåã"
+"äéçæåååèçäèèèçåäåèåéãåææåäççéèïèçäçèæå"
+"èææéæåã"
 
 #: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "åååå"
 
-#: ../monitor/gdu/ggdumount.c:857
-#: ../monitor/udisks2/gvfsudisks2mount.c:649
+#: ../monitor/gdu/ggdumount.c:857 ../monitor/udisks2/gvfsudisks2mount.c:649
 msgid "One or more programs are preventing the unmount operation."
 msgstr "äæååçåéæäåèçæäã"
 
@@ -2086,177 +1873,141 @@ msgstr ""
 "èåçäèéåååçåç\n"
 "èç %s åæååçèæã"
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "CD-ROM Disc"
 msgstr "CD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "Blank CD-ROM Disc"
 msgstr "çç CD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
 msgstr "CD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
 msgstr "çç CD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
 msgstr "CD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
 msgstr "çç CD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "DVD-ROM Disc"
 msgstr "DVD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "Blank DVD-ROM Disc"
 msgstr "çç DVD-ROM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "DVD-RAM Disc"
 msgstr "DVD-RAM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "Blank DVD-RAM Disc"
 msgstr "çç DVD-RAM åç"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "DVD-RW Disc"
 msgstr "DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
 msgstr "çç DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
 msgstr "DVD+R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "Blank DVD+R Disc"
 msgstr "çç DVD+R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
 msgstr "DVD+RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
 msgstr "çç DVD+RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "DVD+R DL Disc"
 msgstr "DVD+R DL åç"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "Blank DVD+R DL Disc"
 msgstr "çç DVD+R DL åç"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blu-Ray Disc"
 msgstr "Blu-Ray åç"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blank Blu-Ray Disc"
 msgstr "çç Blu-Ray åç"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blu-Ray R Disc"
 msgstr "Blu-Ray R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blank Blu-Ray R Disc"
 msgstr "çç Blu-Ray R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blu-Ray RW Disc"
 msgstr "Blu-Ray RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blank Blu-Ray RW Disc"
 msgstr "çç Blu-Ray RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "HD DVD Disc"
 msgstr "HD DVD åç"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "Blank HD DVD Disc"
 msgstr "çç HD DVD åç"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "HD DVD-R Disc"
 msgstr "HD DVD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "Blank HD DVD-R Disc"
 msgstr "çç HD DVD-R åç"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "HD DVD-RW Disc"
 msgstr "HD DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "Blank HD DVD-RW Disc"
 msgstr "çç HD DVD-RW åç"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "MO Disc"
 msgstr "MO åç"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "Blank MO Disc"
 msgstr "çç MO åç"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Disc"
 msgstr "åç"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Blank Disc"
 msgstr "ççåç"
 
@@ -2403,26 +2154,22 @@ msgstr "åéåæèç"
 msgid "Failed to eject media; one or more volumes on the media are busy."
 msgstr "éååéåæïèåéäçäæååååèçæååçã"
 
-#: ../monitor/hal/ghalmount.c:159
-#: ../monitor/hal/ghalvolume.c:163
+#: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../monitor/hal/ghalmount.c:164
-#: ../monitor/hal/ghalvolume.c:168
+#: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../monitor/hal/ghalmount.c:169
-#: ../monitor/hal/ghalvolume.c:173
+#: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../monitor/hal/ghalmount.c:323
-#: ../monitor/hal/ghalvolume.c:244
+#: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
 msgstr "æåéæ/èæåç"
 
@@ -2565,8 +2312,7 @@ msgstr "%s: %sïèåæææççéèï%s\n"
 msgid "%s: %s:error closing: %s\n"
 msgstr "%s: %s:ççéèææéé: %s\n"
 
-#: ../programs/gvfs-cat.c:143
-#: ../programs/gvfs-open.c:61
+#: ../programs/gvfs-cat.c:143 ../programs/gvfs-open.c:61
 #: ../programs/gvfs-rm.c:58
 msgid "FILE"
 msgstr "FILE"
@@ -2595,22 +2341,14 @@ msgstr ""
 "ææïåèåçåçéé cat ååääçåçæåéé\n"
 "å -n, -T æåäã"
 
-#: ../programs/gvfs-cat.c:168
-#: ../programs/gvfs-copy.c:131
-#: ../programs/gvfs-info.c:385
-#: ../programs/gvfs-ls.c:414
-#: ../programs/gvfs-mime.c:94
-#: ../programs/gvfs-mkdir.c:69
-#: ../programs/gvfs-monitor-dir.c:124
-#: ../programs/gvfs-monitor-file.c:123
-#: ../programs/gvfs-mount.c:1034
-#: ../programs/gvfs-move.c:119
-#: ../programs/gvfs-open.c:76
-#: ../programs/gvfs-rename.c:73
-#: ../programs/gvfs-rm.c:70
-#: ../programs/gvfs-save.c:173
-#: ../programs/gvfs-set-attribute.c:149
-#: ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:131
+#: ../programs/gvfs-info.c:387 ../programs/gvfs-ls.c:414
+#: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:69
+#: ../programs/gvfs-monitor-dir.c:124 ../programs/gvfs-monitor-file.c:123
+#: ../programs/gvfs-mount.c:1034 ../programs/gvfs-move.c:119
+#: ../programs/gvfs-open.c:76 ../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:69
 #: ../programs/gvfs-tree.c:260
 #, c-format
 msgid "Error parsing commandline options: %s\n"
@@ -2618,24 +2356,20 @@ 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:180
-#: ../programs/gvfs-open.c:88
+#: ../programs/gvfs-cat.c:180 ../programs/gvfs-open.c:88
 #, c-format
 msgid "%s: missing locations"
 msgstr "%sïææäç"
 
-#: ../programs/gvfs-copy.c:44
-#: ../programs/gvfs-move.c:42
+#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
 msgid "No target directory"
 msgstr "äæçæçé"
 
-#: ../programs/gvfs-copy.c:45
-#: ../programs/gvfs-move.c:43
+#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
 msgid "Show progress"
 msgstr "éçéå"
 
-#: ../programs/gvfs-copy.c:46
-#: ../programs/gvfs-move.c:44
+#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
 msgid "Prompt before overwrite"
 msgstr "åèèåæçäçè"
 
@@ -2643,8 +2377,7 @@ msgstr "åèèåæçäçè"
 msgid "Preserve all attributes"
 msgstr "äçææåæ"
 
-#: ../programs/gvfs-copy.c:48
-#: ../programs/gvfs-move.c:45
+#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
 #: ../programs/gvfs-save.c:43
 msgid "Backup existing destination files"
 msgstr "åäææçççææ"
@@ -2653,20 +2386,17 @@ msgstr "åäææçççææ"
 msgid "Never follow symbolic links"
 msgstr "æäèèçèéç"
 
-#: ../programs/gvfs-copy.c:78
-#: ../programs/gvfs-move.c:67
+#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
 #, c-format
 msgid "progress"
 msgstr "éå"
 
-#: ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-move.c:109
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
 msgid "SOURCE"
 msgstr "SOURCE"
 
-#: ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-move.c:109
-#: ../programs/gvfs-save.c:162
+#: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
+#: ../programs/gvfs-save.c:165
 msgid "DEST"
 msgstr "DEST"
 
@@ -2674,19 +2404,16 @@ msgstr "DEST"
 msgid "Copy one or more files from SOURCE to DEST."
 msgstr "åäæååææå SOURCE èèå DESTã"
 
-#: ../programs/gvfs-copy.c:141
-#: ../programs/gvfs-move.c:129
+#: ../programs/gvfs-copy.c:141 ../programs/gvfs-move.c:129
 #: ../programs/gvfs-rename.c:83
 msgid "Missing operand\n"
 msgstr "çåéçæ\n"
 
-#: ../programs/gvfs-copy.c:149
-#: ../programs/gvfs-move.c:137
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 msgid "Too many arguments\n"
 msgstr "åæåå\n"
 
-#: ../programs/gvfs-copy.c:158
-#: ../programs/gvfs-move.c:146
+#: ../programs/gvfs-copy.c:158 ../programs/gvfs-move.c:146
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "çæ %s äæçé\n"
@@ -2709,18 +2436,15 @@ msgstr "åååååæ"
 msgid "Get file system info"
 msgstr "ååææççèè"
 
-#: ../programs/gvfs-info.c:39
-#: ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "The attributes to get"
 msgstr "èååçåæ"
 
-#: ../programs/gvfs-info.c:39
-#: ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "ATTRIBUTES"
 msgstr "ATTRIBUTES"
 
-#: ../programs/gvfs-info.c:40
-#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
 msgid "Don't follow symbolic links"
 msgstr "äèèèçèéç"
@@ -2762,78 +2486,74 @@ msgstr "åæè"
 msgid "attributes:\n"
 msgstr "åæï\n"
 
-#: ../programs/gvfs-info.c:155
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:156
 #, c-format
 msgid "display name: %s\n"
 msgstr "éçåçï%s\n"
 
-#: ../programs/gvfs-info.c:159
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:161
 #, c-format
 msgid "edit name: %s\n"
 msgstr "çèåçï%s\n"
 
-#: ../programs/gvfs-info.c:165
+#: ../programs/gvfs-info.c:167
 #, c-format
 msgid "name: %s\n"
 msgstr "åçï%s\n"
 
-#: ../programs/gvfs-info.c:172
+#: ../programs/gvfs-info.c:174
 #, c-format
 msgid "type: %s\n"
 msgstr "éåï%s\n"
 
-#: ../programs/gvfs-info.c:178
+#: ../programs/gvfs-info.c:180
 #, c-format
 msgid "size: "
 msgstr "ååï"
 
-#: ../programs/gvfs-info.c:183
+#: ../programs/gvfs-info.c:185
 #, c-format
 msgid "hidden\n"
 msgstr "éè\n"
 
-#: ../programs/gvfs-info.c:268
+#: ../programs/gvfs-info.c:270
 msgid "Copy with file"
 msgstr "éææèè"
 
-#: ../programs/gvfs-info.c:272
+#: ../programs/gvfs-info.c:274
 msgid "Keep with file when moved"
 msgstr "çåæäæææ"
 
-#: ../programs/gvfs-info.c:309
+#: ../programs/gvfs-info.c:311
 #, c-format
 msgid "Error getting writable attributes: %s\n"
 msgstr "ååååååææççéèï%s\n"
 
-#: ../programs/gvfs-info.c:314
+#: ../programs/gvfs-info.c:316
 #, c-format
 msgid "Settable attributes:\n"
 msgstr "åèååæï\n"
 
-#: ../programs/gvfs-info.c:337
+#: ../programs/gvfs-info.c:339
 #, c-format
 msgid "Writable attribute namespaces:\n"
 msgstr "ååååæååçéï\n"
 
-#: ../programs/gvfs-info.c:373
-#: ../programs/gvfs-ls.c:397
-#: ../programs/gvfs-mkdir.c:57
-#: ../programs/gvfs-monitor-dir.c:112
-#: ../programs/gvfs-monitor-file.c:111
-#: ../programs/gvfs-mount.c:1022
-#: ../programs/gvfs-rename.c:64
-#: ../programs/gvfs-set-attribute.c:139
-#: ../programs/gvfs-trash.c:57
-#: ../programs/gvfs-tree.c:248
+#: ../programs/gvfs-info.c:375 ../programs/gvfs-ls.c:397
+#: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-monitor-dir.c:112
+#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1022
+#: ../programs/gvfs-rename.c:64 ../programs/gvfs-set-attribute.c:139
+#: ../programs/gvfs-trash.c:57 ../programs/gvfs-tree.c:248
 msgid "LOCATION"
 msgstr "LOCATION"
 
-#: ../programs/gvfs-info.c:374
+#: ../programs/gvfs-info.c:376
 msgid "Show information about locations."
 msgstr "éçäçççéèèã"
 
-#: ../programs/gvfs-ls.c:40
-#: ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
 msgstr "éçéèææ"
 
@@ -2849,8 +2569,7 @@ msgstr "éçèé"
 msgid "PREFIX"
 msgstr "PREFIX"
 
-#: ../programs/gvfs-ls.c:166
-#: ../programs/gvfs-ls.c:174
+#: ../programs/gvfs-ls.c:166 ../programs/gvfs-ls.c:174
 #: ../programs/gvfs-rename.c:97
 #, c-format
 msgid "Error: %s\n"
@@ -2954,14 +2673,12 @@ msgstr "åçäåçé"
 msgid "Create directories."
 msgstr "åççéã"
 
-#: ../programs/gvfs-mkdir.c:89
-#: ../programs/gvfs-mkdir.c:98
+#: ../programs/gvfs-mkdir.c:89 ../programs/gvfs-mkdir.c:98
 #, 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:38 ../programs/gvfs-monitor-file.c:38
 msgid "Don't send single MOVED events"
 msgstr "äèéååä MOVED ää"
 
@@ -3014,8 +2731,7 @@ msgstr "çèää"
 msgid "Show extra information"
 msgstr "éçéåçèè"
 
-#: ../programs/gvfs-mount.c:169
-#: ../programs/gvfs-mount.c:193
+#: ../programs/gvfs-mount.c:169 ../programs/gvfs-mount.c:193
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "æèäçæççéèï %s\n"
@@ -3025,8 +2741,7 @@ msgstr "æèäçæççéèï %s\n"
 msgid "Error unmounting mount: %s\n"
 msgstr "åèæççéèï %s\n"
 
-#: ../programs/gvfs-mount.c:276
-#: ../programs/gvfs-mount.c:325
+#: ../programs/gvfs-mount.c:276 ../programs/gvfs-mount.c:325
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "åæåèæèççéèï%s\n"
@@ -3094,8 +2809,7 @@ msgstr "ææææåçã"
 msgid "Rename successful. New uri: %s\n"
 msgstr "éæååæåãæç URIï%s\n"
 
-#: ../programs/gvfs-rm.c:34
-#: ../programs/gvfs-trash.c:34
+#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:34
 msgid "Ignore nonexistent files, never prompt"
 msgstr "åçäååçææïæäæç"
 
@@ -3115,38 +2829,41 @@ msgstr "æååææççå"
 msgid "When creating, restrict access to the current user"
 msgstr "çåçæïååæåéæçåçäçè"
 
-#: ../programs/gvfs-save.c:47
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:48
 msgid "Print new etag at end"
 msgstr "åçåååæç etag"
 
-#: ../programs/gvfs-save.c:48
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:50
 msgid "The etag of the file being overwritten"
 msgstr "ååèèçææ etag"
 
-#: ../programs/gvfs-save.c:48
+#: ../programs/gvfs-save.c:50
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../programs/gvfs-save.c:76
+#: ../programs/gvfs-save.c:78
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "éåæææççéèï%s\n"
 
-#: ../programs/gvfs-save.c:109
+#: ../programs/gvfs-save.c:111
 msgid "Error reading stdin"
 msgstr "èå stdin æççéè"
 
-#: ../programs/gvfs-save.c:122
+#: ../programs/gvfs-save.c:124
 #, c-format
 msgid "Error closing: %s\n"
 msgstr "ééæççéèï%s\n"
 
-#: ../programs/gvfs-save.c:134
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:137
 #, c-format
 msgid "Etag not available\n"
 msgstr "Etag çæäç\n"
 
-#: ../programs/gvfs-save.c:163
+#: ../programs/gvfs-save.c:166
 msgid "Read from standard input and save to DEST."
 msgstr "åææèåèåäååå DESTã"
 
@@ -3209,6 +2926,24 @@ msgstr "èèçèéçãæèåæå"
 msgid "List contents of directories in a tree-like format."
 msgstr "äæçæåååçéçååã"
 
+#~ msgid "AFP server %s declined the submitted password"
+#~ msgstr "AFP äæå %s æçäéåçåç"
+
+#~ msgid "Received invalid reply from server"
+#~ msgstr "åäæåååçæçåè"
+
+#~ msgid "Enter password for afp as %s on %s"
+#~ msgstr "èå %s å %s äç afp åç "
+
+#~ msgid "Enter password for afp on %s"
+#~ msgstr "èå %s ç afp åç "
+
+#~ msgid "Failed to logout from server"
+#~ msgstr "çæåäæåçå"
+
+#~ msgid "ID not found"
+#~ msgstr "æäå ID"
+
 #~ msgid "Error creating socket: %s"
 #~ msgstr "åç socket æççéèï%s"
 



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