[gvfs] Assamese translation reviewed



commit df4069ea879668981dc1984b59e4493f77928fd2
Author: Nilamdyuti Goswami <nilamdyuti gmail com>
Date:   Wed Jul 11 16:47:32 2012 +0530

    Assamese translation reviewed

 po/as.po | 1020 +++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 576 insertions(+), 444 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index bf6e93f..243c9b4 100644
--- a/po/as.po
+++ b/po/as.po
@@ -8,64 +8,65 @@ msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
 "cgi?product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-02-23 12:26+0000\n"
-"PO-Revision-Date: 2012-03-05 22:54+0530\n"
+"POT-Creation-Date: 2012-07-10 01:43+0000\n"
+"PO-Revision-Date: 2012-07-11 16:43+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: as_IN <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
+#: ../client/gdaemonfile.c:500 ../client/gdaemonfile.c:2405
 msgid "Operation not supported, files on different mounts"
 msgstr "àà ààààààà àààààààà, ààààààààààà àààà ààààààà ààààààà"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
-#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
-#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
-#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
-#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
-#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
-#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
-#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
-#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
-#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
+#: ../client/gdaemonfile.c:878 ../client/gdaemonfile.c:913
+#: ../client/gdaemonfile.c:1029 ../client/gdaemonfile.c:1108
+#: ../client/gdaemonfile.c:1171 ../client/gdaemonfile.c:1234
+#: ../client/gdaemonfile.c:1300 ../client/gdaemonfile.c:1363
+#: ../client/gdaemonfile.c:1380 ../client/gdaemonfile.c:1869
+#: ../client/gdaemonfile.c:1899 ../client/gdaemonfile.c:2060
+#: ../client/gdaemonfile.c:2565 ../client/gdaemonfile.c:2614
+#: ../client/gdaemonfile.c:2679 ../client/gdaemonfile.c:2764
+#: ../client/gdaemonfile.c:2840 ../client/gdaemonfile.c:3029
+#: ../client/gdaemonfile.c:3110 ../client/gvfsiconloadable.c:145
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
-msgstr "%s -à ààà àààà ààààà àààà ààà"
+msgstr "%s à ààà àààà ààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:996 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "ààààààà àààààààà ààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
-#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
-#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1118 ../client/gdaemonfile.c:1181
+#: ../client/gdaemonfile.c:1244 ../client/gdaemonfile.c:1310
+#: ../client/gdaemonfile.c:2644 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "ààààààà àààààààà ààààà àààà ààà"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1981
+#: ../client/gdaemonfile.c:1983
 msgid "Could not find enclosing mount"
 msgstr "ààààà àààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:2011
+#: ../client/gdaemonfile.c:2013
 #, c-format
 msgid "Invalid filename %s"
 msgstr "àààà ààààààà: %s"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
-#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1192
+#: ../client/gdaemonvfs.c:1344 ../client/gdaemonvfs.c:1396
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "àààààààà àààààààà ààààà ààààà àààààà: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1397
 msgid "values must be string or list of strings"
 msgstr "ààà ààààààà àààà àààààààà àààààà àà ààààà "
 
@@ -91,11 +92,11 @@ msgstr "ààà ààààààà àààà àààààààà 
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
 #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
-#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
-#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
-#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
-#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
-#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
+#: ../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 "ààààààà ààààà ààà ààààà"
 
@@ -124,19 +125,19 @@ msgstr "àààààààà àààààà"
 msgid "Seek not supported on stream"
 msgstr "ààààààà àààààà Seek ààààààà ààà"
 
-#: ../client/gdaemonvfs.c:830
+#: ../client/gdaemonvfs.c:837
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "ààààààà àààà ààààààà ààààà àààààà: %s"
 
-#: ../client/gdaemonvfs.c:1199
+#: ../client/gdaemonvfs.c:1193
 msgid "Can't contact session bus"
 msgstr "ààààààà àààà àààà ààààà ààààààà àààààà"
 
 #: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
-msgstr "ààààà àààà àààààà àààààà:%s"
+msgstr "ààààà àààà àààààà àààààà:%s"
 
 #: ../common/gsysutils.c:136
 #, c-format
@@ -188,7 +189,7 @@ msgid ""
 "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
 "records are missing. Keys required: \"%s\"."
 msgstr ""
-"àààààà \"%s\" -à    \"%s\" àààà \"%s\" àààààà ààààà ààààààà ààà àààà àààà TXT "
+"àààààà \"%s\" à    \"%s\" àààà \"%s\" àààààà ààààà ààààààà ààà àààà àààà TXT "
 "àààààà àààà àààààà àà: \"%s\"à"
 
 #. Translators:
@@ -199,27 +200,27 @@ msgstr ""
 #: ../common/gvfsdnssdresolver.c:1143
 #, c-format
 msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
-msgstr "ààààà \"%s\" -à  \"%s\" àààà \"%s\" àààààà ààààà ààà àààà àà"
+msgstr "ààààà \"%s\" à  \"%s\" àààà \"%s\" àààààà ààààà ààà àààà àà"
 
 #: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
 #: ../common/gvfsdnssdutils.c:280
 #, c-format
 msgid "Malformed dns-sd encoded_triple '%s'"
-msgstr "ààààààààààà dns-sd encoded triple '%s' (_t) "
+msgstr "ààààààààààà dns-sd encoded_triple '%s' "
 
 #: ../common/gvfsicon.c:250
 #, c-format
 msgid "Can't handle version %d of GVfsIcon encoding"
-msgstr "GVfsIcon ààààààà à %d ààààààà ààààààààààà àààà àààààà"
+msgstr "GVfsIcon ààà'àààà %d ààààààà ààààààààààà àààà àààààà"
 
 #: ../common/gvfsicon.c:260
 msgid "Malformed input data for GVfsIcon"
-msgstr "GVfsIcon -à àààà ààààààààààà ààààà àààà"
+msgstr "GVfsIcon à àààà ààààààààààà ààààà àààà"
 
 #: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
-msgstr "D-Bus -à àààà ààààà ààààà àààààà: %s"
+msgstr "D-Bus à àààà ààààà ààààà àààààà: %s"
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
@@ -229,7 +230,8 @@ msgid "%s Filesystem Service"
 msgstr "%s àààààààààààààà àààà"
 
 #: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
-#: ../programs/gvfs-move.c:78
+#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
+#: ../programs/gvfs-set-attribute.c:105
 #, c-format
 msgid "Error: %s"
 msgstr "àààààà: %s"
@@ -237,12 +239,12 @@ msgstr "àààààà: %s"
 #: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
-msgstr "ààààààà: %s --spawner dbus-id ààààààà àà (_p)"
+msgstr "ààààààà: %s --spawner dbus-id object_path"
 
 #: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
-msgstr "ààààààà: %s àààà=ààà àààà=ààà ..."
+msgstr "ààààààà: %s àà'=ààà àà'=ààà ..."
 
 #: ../daemon/daemon-main.c:201
 #, c-format
@@ -252,52 +254,51 @@ msgstr "àààà àààààà ààà ààààààà àà
 #: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
-msgstr "%s -à àààà àààààààààààà àààààààà ààà ààà"
+msgstr "%s à àààà ààààààààààà àààààààà ààà ààà"
 
 #: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "àààààà àààà ààààà ààààà àààààà"
 
-#: ../daemon/gvfsafpconnection.c:1409
+#: ../daemon/gvfsafpconnection.c:1412
 msgid "Connection unexpectedly went down"
 msgstr "ààààà ààààààààààààààà àààà àà"
 
-#: ../daemon/gvfsafpconnection.c:1436
+#: ../daemon/gvfsafpconnection.c:1439
 msgid "Got EOS"
 msgstr "EOS àààà àà"
 
-#: ../daemon/gvfsafpserver.c:171 ../daemon/gvfsafpserver.c:457
+#: ../daemon/gvfsafpserver.c:172 ../daemon/gvfsafpserver.c:458
 #, c-format
-#| msgid "Server doesn't support passwords longer than 64 characters"
 msgid "Server doesn't support passwords longer than %d characters"
 msgstr "àààààààà %d àààààà àààà àààààààààààà àààààà àààà"
 
-#: ../daemon/gvfsafpserver.c:199 ../daemon/gvfsafpserver.c:512
+#: ../daemon/gvfsafpserver.c:200 ../daemon/gvfsafpserver.c:513
 msgid "An invalid username was provided"
 msgstr "ààà àààà àààààààààààààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsafpserver.c:378 ../daemon/gvfsafpserver.c:606
+#: ../daemon/gvfsafpserver.c:379 ../daemon/gvfsafpserver.c:607
 #, c-format
 msgid "AFP server %s declined the submitted password"
-msgstr "AFP ààààààà %s -à ààà àààà àààààààà àààà ààààà"
+msgstr "AFP ààààààà %s à ààà àààà àààààààà àààà ààààà"
 
-#: ../daemon/gvfsafpserver.c:652 ../daemon/gvfsafpserver.c:681
+#: ../daemon/gvfsafpserver.c:653 ../daemon/gvfsafpserver.c:682
 #, c-format
 msgid "AFP server %s doesn't support anonymous login"
-msgstr "AFP ààààààà %s -à àààààà àààà àààààà àààà"
+msgstr "AFP ààààààà %s à àààààà àààà àààààà àààà"
 
-#: ../daemon/gvfsafpserver.c:709
+#: ../daemon/gvfsafpserver.c:710
 #, c-format
 msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
-msgstr "AFP ààààààà %s -àà àààà àààààà àà (àààà ààààà àààààààààà àààààà àààà ààà)"
+msgstr "AFP ààààààà %s àà àààà àààààà àà (àààà ààààà àààààààààà àààààà àààà ààà)"
 
-#: ../daemon/gvfsafpserver.c:780
+#: ../daemon/gvfsafpserver.c:781
 #, c-format
 msgid "Failed to connect to server (%s)"
-msgstr "ààààààà (%s) -àà ààààà àààààà àààààà"
+msgstr "ààààààà (%s) àà ààààà àààààà àààààà"
 
 #
-#: ../daemon/gvfsafpserver.c:885 ../daemon/gvfsafpvolume.c:391
+#: ../daemon/gvfsafpserver.c:886 ../daemon/gvfsafpvolume.c:391
 #: ../daemon/gvfsafpvolume.c:664 ../daemon/gvfsafpvolume.c:817
 #: ../daemon/gvfsafpvolume.c:1011 ../daemon/gvfsafpvolume.c:1211
 #: ../daemon/gvfsafpvolume.c:1394 ../daemon/gvfsafpvolume.c:1551
@@ -309,35 +310,34 @@ msgstr "ààààààà (%s) -àà ààààà àààààà 
 msgid "Permission denied"
 msgstr "àààààà àààà ààà àààà"
 
-#: ../daemon/gvfsafpserver.c:890
+#: ../daemon/gvfsafpserver.c:891
 #, c-format
-#| msgid "Command not supported"
 msgid "Command is not supported by server"
 msgstr "àààààà ààààààà àààààà ààààààà ààà"
 
-#: ../daemon/gvfsafpserver.c:894
+#: ../daemon/gvfsafpserver.c:895
 #, c-format
 msgid "User's password has expired"
 msgstr "àààààààààààà ààààààààà ààààà ààààà"
 
-#: ../daemon/gvfsafpserver.c:898
+#: ../daemon/gvfsafpserver.c:899
 #, c-format
 msgid "User's password needs to be changed"
-msgstr "àààààààààààà àààààààà àààà àààà ààààààà"
+msgstr "àààààààààààà àààààààà àààà àààà ààààààà ààà"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsafpserver.c:990
+#: ../daemon/gvfsafpserver.c:995
 #, c-format
 msgid "Enter password for afp as %s on %s"
-msgstr "%s -à %s àààà afp -à àààà àààààààà àààààà"
+msgstr "%s à %s àààà afp à àààà àààààààà àààààààà"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:993
+#: ../daemon/gvfsafpserver.c:998
 #, c-format
 msgid "Enter password for afp on %s"
-msgstr "%s -à afp -à àààà àààààààà àààààà"
+msgstr "%s à afp à àààà àààààààà àààààààà"
 
-#: ../daemon/gvfsafpserver.c:1025 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsafpserver.c:1030 ../daemon/gvfsbackendftp.c:518
 #: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
 #: ../daemon/gvfsbackendsmb.c:619
 msgid "Password dialog cancelled"
@@ -345,23 +345,21 @@ msgstr "àààààààà ààààà ààààà ààà à
 
 #: ../daemon/gvfsafputils.c:124
 #, c-format
-#| msgid "Got error code: %d from server"
 msgid "Got error \"%s\" from server"
 msgstr "àààààààà ààà àààààà \"%s\" ààààààà àà"
 
 #: ../daemon/gvfsafputils.c:127
 #, c-format
-#| msgid "Got error code: %d from server"
 msgid "Got unknown error code %d from server"
 msgstr "àààààààà ààà àààààà àààààà à'à %d ààààààà àà"
 
 #: ../daemon/gvfsafpvolume.c:147
 #, c-format
 msgid "Couldn't mount AFP volume %s on %s"
-msgstr "%s -à AFP àààà %s àààààà àààà àààààà"
+msgstr "%s à AFP àààà %s àààààà àààà àààààà"
 
 #: ../daemon/gvfsafpvolume.c:395 ../daemon/gvfsafpvolume.c:1891
-#: ../daemon/gvfsafpvolume.c:2664 ../daemon/gvfsbackendafc.c:928
+#: ../daemon/gvfsafpvolume.c:2664 ../daemon/gvfsbackendafc.c:936
 #: ../daemon/gvfsbackendafpbrowse.c:189 ../daemon/gvfsbackendafpbrowse.c:322
 #: ../daemon/gvfsbackendafpbrowse.c:354 ../daemon/gvfsbackendarchive.c:647
 #: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
@@ -377,11 +375,11 @@ msgstr "ààààààà ààà"
 #: ../daemon/gvfsafpvolume.c:399 ../daemon/gvfsafpvolume.c:464
 #: ../daemon/gvfsafpvolume.c:2668 ../daemon/gvfsbackendafp.c:275
 #: ../daemon/gvfsbackendafp.c:476 ../daemon/gvfsbackendafp.c:1316
-#: ../daemon/gvfsbackenddav.c:2210 ../daemon/gvfsbackendftp.c:773
+#: ../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 "ààààààààà ààààààààà ààà"
+msgstr "ààààààààà ààààààààà àà"
 
 #: ../daemon/gvfsafpvolume.c:403
 msgid "Too many files open"
@@ -393,12 +391,11 @@ msgstr "ààààààà ààààààà àààà ààà"
 
 #
 #: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsbackendburn.c:420
-#: ../daemon/gvfsbackenddav.c:2559 ../daemon/gvfsbackendsftp.c:1828
+#: ../daemon/gvfsbackenddav.c:2590 ../daemon/gvfsbackendsftp.c:1828
 msgid "Directory not empty"
 msgstr "ààààààààà àààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:676
-#| msgid "Target object is marked as DeleteInhibit"
 msgid "Target object is marked as not deletable (DeleteInhibit)"
 msgstr "àààààà ààààààà àààà àààààà (DeleteInhibit) àààààà ààààààà ààà"
 
@@ -421,8 +418,8 @@ msgstr "ààààà àààààààà ààààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:829 ../daemon/gvfsafpvolume.c:1410
 #: ../daemon/gvfsafpvolume.c:1567 ../daemon/gvfsbackendafp.c:282
-#: ../daemon/gvfsbackendafp.c:483 ../daemon/gvfsbackenddav.c:2266
-#: ../daemon/gvfsbackenddav.c:2519 ../daemon/gvfsbackenddav.c:2630
+#: ../daemon/gvfsbackendafp.c:483 ../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
@@ -443,19 +440,17 @@ msgstr "àààààà ààààààààà àààààààà
 
 #: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsbackendafp.c:588
 msgid "Can't rename volume"
-msgstr "àààà àààà ààààààà àààà àààààà"
+msgstr "àààà àààà àààààà àààà àààààà"
 
 #: ../daemon/gvfsafpvolume.c:1219
 msgid "Object with that name already exists"
 msgstr "ààà àààà ààà ààààààà àààààààà ààààààààààà"
 
 #: ../daemon/gvfsafpvolume.c:1223
-#| msgid "Target object is marked as RenameInhibit"
 msgid "Target object is marked as not renameable (RenameInhibit)"
-msgstr "àààààà ààààààà àààà ààààààà àààà àààààà (RenameInhibit) àààààà ààààààà ààà ààà"
+msgstr "àààààà ààààààà àààà àààààà àààà àààààà (RenameInhibit) àààààà ààààààà ààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:1398
-#| msgid "Can't move directory into one of it's descendants"
 msgid "Can't move directory into one of its descendants"
 msgstr "àààààààààà àààà àààààà ààà ààààààààààà àààààààààà àààà àààààà"
 
@@ -468,11 +463,10 @@ msgid "Can't move a shared directory into the Trash"
 msgstr "ààà àààààààà àààààààààà ààààààààà àààààààààà àààà àààààà"
 
 #: ../daemon/gvfsafpvolume.c:1414
-#| msgid "Object being moved is marked as RenameInhibit"
 msgid "Object being moved is marked as not renameable (RenameInhibit)"
 msgstr ""
-"àààààààààà àààà àààà àààààààà àààà ààààààà àààà àààààà (RenameInhibit) àààààà ààààààà "
-"ààà ààà"
+"àààààààààà àààà àààà àààààààà àààà àààààà àààà àààààà (RenameInhibit) àààààà "
+"ààààààà ààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:1418
 msgid "Object being moved doesn't exist"
@@ -483,9 +477,8 @@ msgid "Server doesn't support the FPCopyFile operation"
 msgstr "àààààààà FPCopyFile ààààààà àààààà àààà"
 
 #: ../daemon/gvfsafpvolume.c:1559
-#| msgid "Couldn't open source file as Read/DenyWrite"
 msgid "Unable to open source file for reading"
-msgstr "ààà àààààààà àààà àààà ààààààà ààààà"
+msgstr "ààà àààààààà àààà àààà ààààààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1571
 msgid "Source file and/or destination directory doesn't exist"
@@ -582,88 +575,84 @@ msgstr ""
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "ààààààààààà libimobiledevice àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:382
+#: ../daemon/gvfsbackendafc.c:390
 msgid "Try again"
 msgstr "àààà àààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../daemon/gvfsbackendafc.c:390 ../daemon/gvfsbackend.c:963
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
-#: ../monitor/udisks2/gvfsudisks2mount.c:709
+#: ../monitor/udisks2/gvfsudisks2mount.c:720
 msgid "Cancel"
-msgstr "ààààà"
+msgstr "ààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1806
+#: ../daemon/gvfsbackendafc.c:408 ../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:406 ../daemon/gvfsbackendafc.c:436
+#: ../daemon/gvfsbackendafc.c:414 ../daemon/gvfsbackendafc.c:444
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "àààà AFC ààààààà:  afc://uuid:port-number ààààà ààààà ààààà"
 
-#: ../daemon/gvfsbackendafc.c:422
+#: ../daemon/gvfsbackendafc.c:430
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple àààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:427
+#: ../daemon/gvfsbackendafc.c:435
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Apple àààààà àààààà, Jailbroken"
 
-#: ../daemon/gvfsbackendafc.c:432
+#: ../daemon/gvfsbackendafc.c:440
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple àààààà ààààààà àààààààààààà"
 
-#: ../daemon/gvfsbackendafc.c:490
+#: ../daemon/gvfsbackendafc.c:498
 #, c-format
 msgid "%s (jailbreak)"
-msgstr "%s (ààààààààà)"
+msgstr "%s (jailbreak)"
 
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:505 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
-msgstr "%s -à ààà àààààààààààà"
+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:579
+#: ../daemon/gvfsbackendafc.c:587
 #, c-format
-#| msgid ""
-#| "Device '%s' is password protected. Enter the password on the device and "
-#| "click 'Try again'."
 msgid ""
 "The device '%s' is locked. Enter the passcode on the device and click 'Try "
 "again'."
 msgstr ""
-"'%s' àààààà àà ààà àààà ààààààà àààà'ààà àààààà ààà 'àààà àààààà "
-"ààà' ààààà àààà"
+"'%s' àààààà àà ààà àààà ààààààà àààà'ààà àààààààà ààà 'àààà àààààà ààà' ààààà àààà"
 
 #
-#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendafc.c:926 ../daemon/gvfsbackendarchive.c:655
 #: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "ààààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
+#: ../daemon/gvfsbackendafc.c:1127 ../daemon/gvfsbackendafc.c:2470
 msgid "Backups are not yet supported."
 msgstr "ààà ààà àààà àààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:1291
+#: ../daemon/gvfsbackendafc.c:1299
 msgid "Invalid seek type"
 msgstr "àààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:1755
+#: ../daemon/gvfsbackendafc.c:2307 ../daemon/gvfsbackendafp.c:1755
 #: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
 #: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
 #: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
@@ -679,22 +668,20 @@ msgstr "àà ààààààààà àààààà àààà à
 #. Translators: first %s is username and second serververname
 #: ../daemon/gvfsbackendafpbrowse.c:431
 #, c-format
-#| msgid "AFP volume %s for %s on %s"
 msgid "AFP volumes for %s on %s"
-msgstr "%s -à %s -à àààà AFP àààààààà"
+msgstr "%s à %s à àààà AFP àààààààà"
 
 #. Translators: %s is the servername
 #: ../daemon/gvfsbackendafpbrowse.c:435
 #, c-format
-#| msgid "AFP volume %s on %s"
 msgid "AFP volumes on %s"
-msgstr "%s -à  AFP àààààààà"
+msgstr "%s à  AFP àààààààà"
 
 #: ../daemon/gvfsbackendafpbrowse.c:468 ../daemon/gvfsbackendafp.c:2083
 #: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
 #: ../daemon/gvfsbackendsftp.c:1745
 msgid "No hostname specified"
-msgstr "àààà àààààààà ààààààà ààà àààà ààà"
+msgstr "àààà ààààààà ààààààà ààà àààà ààà"
 
 #: ../daemon/gvfsbackendafpbrowse.c:537 ../daemon/gvfsbackendafp.c:2173
 msgid "Apple Filing Protocol Service"
@@ -704,7 +691,7 @@ msgstr "Apple àààààà ààààààà àààà"
 #: ../daemon/gvfsbackendafp.c:272 ../daemon/gvfsbackendburn.c:871
 #: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
 msgid "Can't copy directory over directory"
-msgstr "ààààààààà-à ààààààààà ààà ààà ààààà"
+msgstr "àààààààààà ààààààààà ààà ààà ààààà"
 
 #
 #: ../daemon/gvfsbackendafp.c:291 ../daemon/gvfsbackendburn.c:887
@@ -716,21 +703,19 @@ msgstr "ààààààà ààààààààà ààà ààà 
 #: ../daemon/gvfsbackendafp.c:473 ../daemon/gvfsbackendsftp.c:4271
 #: ../daemon/gvfsbackendsmb.c:2071
 msgid "Can't move directory over directory"
-msgstr "ààààààààà-à ààààààààà àààààààààà ààà ààààà"
+msgstr "àààààààààà ààààààààà àààààààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendafp.c:1235 ../daemon/gvfsbackendafp.c:1334
-#| msgid "backups not supported yet"
 msgid "backups not supported"
 msgstr "àààààà àààà àààààà ààà"
 
 #: ../daemon/gvfsbackendafp.c:1249
 #, c-format
-#| msgid "Unable to create temporary file"
 msgid "Unable to create temporary file (%s)"
 msgstr "ààààààà ààààààà (%s) àààààà àààààà ààààà"
 
 #
-#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackenddav.c:2339
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackenddav.c:2370
 #: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
 msgid "The file was externally modified"
 msgstr "ààààààààà ààààààààààà àààààààà ààà ààààà"
@@ -744,13 +729,13 @@ msgstr "àààà àààààààààà ààà (uint32 ààà
 #: ../daemon/gvfsbackendafp.c:2044
 #, c-format
 msgid "AFP volume %s for %s on %s"
-msgstr "%s -à %s -à àààà AFP àààà %s"
+msgstr "%s à %s à àààà AFP àààà %s"
 
 #. Translators: first %s is volumename and second servername
 #: ../daemon/gvfsbackendafp.c:2049
 #, c-format
 msgid "AFP volume %s on %s"
-msgstr "%s -à %s -à àààà AFP àààà"
+msgstr "%s à AFP àààà %s"
 
 #: ../daemon/gvfsbackendafp.c:2092
 msgid "No volume specified"
@@ -763,7 +748,7 @@ msgstr "àààà àààà ààààààà ààà àààà 
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
-msgstr "/ %s -àà"
+msgstr "%s à /"
 
 #: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:675
 #: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
@@ -786,7 +771,7 @@ msgstr "ààààààà ààààààààà àààààà à
 #: ../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:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:1205 ../daemon/gvfsbackendgphoto2.c:2129
 #: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
@@ -797,7 +782,7 @@ msgstr "ààà àààà ààààààà àà àààààà
 #: ../daemon/gvfsbackendburn.c:454 ../daemon/gvfsbackendburn.c:899
 #: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
-msgstr "ààààààààà-à ààààààà ààà àààà àààààà"
+msgstr "àààààààààà ààààààà ààà àààà àààààà"
 
 #. Translators: this is the display name of the backend
 #: ../daemon/gvfsbackendburn.c:646
@@ -832,8 +817,8 @@ msgstr "ààààààà ààààààààààà"
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
 #: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
-#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1091
-#: ../monitor/udisks2/gvfsudisks2volume.c:1252
+#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1104
+#: ../monitor/udisks2/gvfsudisks2volume.c:1508
 msgid "Operation not supported by backend"
 msgstr "ààààààà ààààààà àààààà ààààààà ààà"
 
@@ -855,12 +840,12 @@ msgid "Not supported"
 msgstr "ààààààà ààà"
 
 #: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
-#: ../monitor/udisks2/gvfsudisks2mount.c:708
+#: ../monitor/udisks2/gvfsudisks2mount.c:718
 msgid "Unmount Anyway"
 msgstr "àààààà àààààààà ààà"
 
 #: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
-#: ../monitor/udisks2/gvfsudisks2mount.c:710
+#: ../monitor/udisks2/gvfsudisks2mount.c:721
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -868,19 +853,19 @@ msgstr ""
 "àààà àààààààà àààààà\n"
 "ààà àààà àààà ààààààààà àààààà àààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1508
 msgid "Cannot create gudev client"
 msgstr "gudev àààààààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1526
 msgid "Cannot connect to the system bus"
 msgstr "ààààààà àààà àààà ààààà àààà àààààà"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1538
 msgid "Cannot create libhal context"
 msgstr "libhal ààààààààààààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1551
 msgid "Cannot initialize libhal"
 msgstr "libhal ààààà ààà ààààà"
 
@@ -896,19 +881,19 @@ msgstr "àààààà àààà ààà: %s"
 #: ../daemon/gvfsbackendcdda.c:430
 #, c-format
 msgid "Drive %s does not contain audio files"
-msgstr "àààààà %s-à àààà àààà' ààààààà ààà"
+msgstr "àààààà %sà àààà àààà' ààààààà ààà"
 
 #. Translator: %s is the device the disc is inserted into. 'cdda' is the name
 #. name of the backend and shouldn't be translated.
 #: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
-msgstr "%s -à cdda àààààà"
+msgstr "%s à cdda àààààà"
 
 #: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
 #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
-#: ../monitor/udisks2/gvfsudisks2volume.c:296
+#: ../monitor/udisks2/gvfsudisks2volume.c:304
 #, c-format
 msgid "Audio Disc"
 msgstr "àààà' ààààà"
@@ -923,13 +908,13 @@ msgstr[1] "ààààààà ààààààà àààààà: %d 
 #: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
-msgstr "%s àààà àààà ààààààà, %s àààààààà ààààààà ààà"
+msgstr "%s àààà àààà ààààààà, %s ààààààà ààààààà ààà"
 
 #. Translators: paranoia is the name of the cd audio reading library
 #: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
-msgstr "àààààà %s -à  'paranoia -à ààà àààààà àààààà"
+msgstr "àààààà %s à  'paranoia à ààà àààààà àààààà"
 
 #: ../daemon/gvfsbackendcdda.c:868
 #, c-format
@@ -944,7 +929,7 @@ msgstr "ààà àààà ààààààà ààà"
 #: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
-msgstr "àà àààà ààààààààà àà ààà àààà àààà' ààààààà ààà"
+msgstr "àà àààà ààààààààà ààà àààà àààà' ààààààà ààà"
 
 #: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
@@ -1007,7 +992,7 @@ msgstr "ààààààà poll ààà ààààà"
 #: ../daemon/gvfsbackenddav.c:485
 #, c-format
 msgid "WebDAV as %s on %s%s"
-msgstr "WebDAV àààà %s%s -à %s"
+msgstr "WebDAV àààà %s%s à %s"
 
 #. Translators: This is the name of the WebDAV share constructed as
 #. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
@@ -1015,55 +1000,55 @@ msgstr "WebDAV àààà %s%s -à %s"
 #: ../daemon/gvfsbackenddav.c:493
 #, c-format
 msgid "WebDAV on %s%s"
-msgstr "%s%s -à WebDAV"
+msgstr "%s%s à WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1873
+#: ../daemon/gvfsbackenddav.c:680 ../daemon/gvfsbackenddav.c:1910
 #: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP àààààà: %s"
 
-#: ../daemon/gvfsbackenddav.c:685
+#: ../daemon/gvfsbackenddav.c:697
 msgid "Could not parse response"
 msgstr "ààààààààààà àààààààà ààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:694
+#: ../daemon/gvfsbackenddav.c:706
 msgid "Empty response"
 msgstr "ààààààààààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:702
+#: ../daemon/gvfsbackenddav.c:714
 msgid "Unexpected reply from server"
 msgstr "àààààààà ààà ààààààààààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:1382 ../daemon/gvfsbackenddav.c:2008
-#: ../daemon/gvfsbackenddav.c:2095 ../daemon/gvfsbackenddav.c:2202
+#: ../daemon/gvfsbackenddav.c:1394 ../daemon/gvfsbackenddav.c:2039
+#: ../daemon/gvfsbackenddav.c:2126 ../daemon/gvfsbackenddav.c:2233
 msgid "Response invalid"
 msgstr "àààà ààààààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1525
+#: ../daemon/gvfsbackenddav.c:1537
 msgid "WebDAV share"
 msgstr "WebDAV àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1527
+#: ../daemon/gvfsbackenddav.c:1539
 #, c-format
 msgid "Enter password for %s"
-msgstr "%s à àààà àààààààà àààààà"
+msgstr "%s à àààà àààààààà àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1530
+#: ../daemon/gvfsbackenddav.c:1542
 msgid "Please enter proxy password"
-msgstr "ààààààà ààà ààààààà àààààààà àààààà"
+msgstr "ààààààà ààà ààààààà àààààààà àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1877 ../daemon/gvfsbackenddav.c:1881
+#: ../daemon/gvfsbackenddav.c:1914 ../daemon/gvfsbackenddav.c:1918
 msgid "Not a WebDAV enabled share"
 msgstr "WebDAV ààààààààà àààààààà ààà"
 
-#: ../daemon/gvfsbackenddav.c:1962 ../daemon/gvfsbackenddav.c:2050
-#: ../daemon/gvfsbackenddav.c:2123 ../daemon/gvfsbackenddav.c:2236
+#: ../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:2370 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "ààààà ààààààà àààààà ààà ààààà"
@@ -1092,24 +1077,24 @@ msgstr "àààààààà"
 #: ../daemon/gvfsbackendftp.c:488
 #, c-format
 msgid "Enter password for FTP as %s on %s"
-msgstr "%s -à %s  àààààà FTP à àààà àààààààà àààààà"
+msgstr "%s à %s  àààààà FTP à àààà àààààààà àààààààà"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsbackendftp.c:491
 #, c-format
 msgid "Enter password for FTP on %s"
-msgstr "%s -à  FTP  -à àààà àààààààà àààààà"
+msgstr "%s à  FTP à àààà àààààààà àààààààà"
 
 #: ../daemon/gvfsbackendftp.c:630
 #, c-format
 msgid "FTP on %s"
-msgstr "%s -à FTP"
+msgstr "%s à FTP"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendftp.c:634
 #, c-format
 msgid "FTP as %s on %s"
-msgstr "%s -à  %s àààààà FTP"
+msgstr "%s à  %s àààààà FTP"
 
 #: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
@@ -1128,7 +1113,7 @@ msgstr "%s: %d: ààààààààà àààà ààààààà 
 #: ../daemon/gvfsbackendgphoto2.c:513
 #, c-format
 msgid "%s: %d: No such file or directory"
-msgstr "%s: %d: ààà àààà àààà ààààààà àà ààààààààà ààà"
+msgstr "%s: %d: ààà àààà ààààààà àà ààààààààà ààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:519
 #, c-format
@@ -1141,14 +1126,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: ààààààà ààà"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
+#: ../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:945 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:947 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1156,60 +1141,60 @@ msgstr "%s àààààà"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:948 ../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:957 ../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:959 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "àààà' ààààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1565
+#: ../daemon/gvfsbackendgphoto2.c:1567
 msgid "No device specified"
 msgstr "àààà àààààà ààààààà ààà àààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1586
+#: ../daemon/gvfsbackendgphoto2.c:1588
 msgid "Cannot create gphoto2 context"
 msgstr "gphoto2 ààààààààààààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1596
+#: ../daemon/gvfsbackendgphoto2.c:1598
 msgid "Error creating camera"
 msgstr "àààààà àààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
+#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendgphoto2.c:1621
 msgid "Error loading device information"
-msgstr "àààààà àààà ààà ààààà àààààà"
+msgstr "àààààà àààà à'à ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1631
+#: ../daemon/gvfsbackendgphoto2.c:1633
 msgid "Error looking up device information"
 msgstr "àààààà àààà ààààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1641
+#: ../daemon/gvfsbackendgphoto2.c:1643
 msgid "Error getting device information"
 msgstr "àààààà àààà ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1654
+#: ../daemon/gvfsbackendgphoto2.c:1656
 msgid "Error setting up camera communications port"
 msgstr "ààààààà àààà ààààà ààààà ààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1665
+#: ../daemon/gvfsbackendgphoto2.c:1667
 msgid "Error initializing camera"
 msgstr "àààààà ààààà ààààà àààààà"
 
 #. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
 #. backend and shouldn't be translated.
-#: ../daemon/gvfsbackendgphoto2.c:1680
+#: ../daemon/gvfsbackendgphoto2.c:1682
 #, c-format
 msgid "gphoto2 mount on %s"
-msgstr "%s -à gphoto2 àààààà"
+msgstr "%s à gphoto2 àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
@@ -1235,7 +1220,7 @@ msgstr "ààààààààààà àààà àààààààà
 #: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
-msgstr "àààààà %s-à ààààààà àààààà  ààààà àààààà"
+msgstr "àààààà %s à ààààààà àààààà  ààààà àààààà"
 
 #
 #: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
@@ -1265,11 +1250,11 @@ msgstr "àààà ààà àààààà àààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
-msgstr "ààààààààà àààà ààààààà ààààà àààààà"
+msgstr "ààààààààà àààà àààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
-msgstr "àààààààà àààà ààààààà ààààà àààààà"
+msgstr "àààààààà àààà àààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
@@ -1353,7 +1338,7 @@ msgstr "àààààààà ààààààà ààààà"
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
-msgstr "%s -à %s"
+msgstr "%s à %s"
 
 #: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
@@ -1365,7 +1350,7 @@ msgstr "ààààààà àààà ààààà ààààààà
 
 #: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
-msgstr "ààààààà ààà  ààààààà àààààà ààààààà"
+msgstr "ààààààà ààà ààààààà àààààà ààààààà"
 
 #: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
@@ -1374,15 +1359,15 @@ msgstr "ààààààà ààààà àààààà: %s"
 
 #: ../daemon/gvfsbackendsftp.c:302 ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
-msgstr "ssh ààààààààà ààààààààààààààà àààà àà àà"
+msgstr "ssh àààààààà ààààààààààààààà àààà àà àà"
 
 #: ../daemon/gvfsbackendsftp.c:317
 msgid "Hostname not known"
-msgstr "àààààà ààà àààààà"
+msgstr "ààààà ààà àààààà"
 
 #: ../daemon/gvfsbackendsftp.c:324
 msgid "No route to host"
-msgstr "àààààà àààà àààààà àà àààà ààààà"
+msgstr "ààààà àààà àààààà àà àààà ààààà"
 
 #: ../daemon/gvfsbackendsftp.c:331
 msgid "Connection refused by server"
@@ -1390,16 +1375,16 @@ msgstr "àààààààà ààààà àààààààààà
 
 #: ../daemon/gvfsbackendsftp.c:338
 msgid "Host key verification failed"
-msgstr "ààààà àààà ààààààà àààààà àààààà àà"
+msgstr "àààà àà' ààààààà àààààà àààààà àà"
 
 #: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
-msgstr "ssh ààààààààà àààààà ààà ààààà"
+msgstr "ssh àààààààà àààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
-msgstr "ssh ààààààààà àààààà ààà ààààà: %s"
+msgstr "ssh àààààààà àààààà ààà ààààà: %s"
 
 #: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
@@ -1409,25 +1394,25 @@ msgstr "àà-àà àààà ààà àààà àà"
 #: ../daemon/gvfsbackendsftp.c:958
 #, c-format
 msgid "Enter passphrase for key for ssh as %s on %s"
-msgstr "ssh -à ààààà ààààà passphrase àààààà àààà %s -à %s"
+msgstr "ssh à àà'à ààààà passphrase àààààààà àààà %s à %s"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendsftp.c:961
 #, c-format
 msgid "Enter password for ssh as %s on %s"
-msgstr "ssh -à ààààà àààààààà àààààà àààà %s -à %s"
+msgstr "ssh à ààààà àààààààà àààààààà àààà %s à %s"
 
 #. Translators: %s is the hostname
 #: ../daemon/gvfsbackendsftp.c:965
 #, c-format
 msgid "Enter passphrase for key for ssh on %s"
-msgstr "%s -à ààà ssh -à ààààà ààààà passphrase àààààà"
+msgstr "%s à ààà ssh à àà'à ààààà passphrase àààààààà"
 
 #. Translators: %s is the hostname
 #: ../daemon/gvfsbackendsftp.c:968
 #, c-format
 msgid "Enter password for ssh on %s"
-msgstr "%s -à ààà ssh -à ààààà àààààààà àààààà"
+msgstr "%s à ààà ssh à ààààà àààààààà àààààààà"
 
 #: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
@@ -1451,10 +1436,10 @@ msgid ""
 "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"
+"àààààààà àààààààà (%s)  à ààààà ààààààà\n"
+"à ààààà ààààààààà àààààààà àà-àà ààààà ààààààà àààà\n"
 "\n"
-"%s àààààààà ààààààààà àààààà ààààà àààààà ààààà ààà ààààààà àà àààààà àààààà ààààààà "
+"%s àààààààà àààààààà àààààà ààààà àààààà ààààà ààà ààààààà àà àààààà àààààà ààààààà "
 "àààààààà àààà ààààààà àààà"
 
 #: ../daemon/gvfsbackendsftp.c:1085
@@ -1463,24 +1448,24 @@ msgstr "àà-àà ààààà ààààà ààà àààà"
 
 #: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
-msgstr "àààààà ààààààààà àààààà àààà àààààà"
+msgstr "ààààà ààààààààà àààààà àààà àààààà"
 
 #
 #: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
-msgstr "àààààààà àààà"
+msgstr "ààààààà àààà"
 
 #. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
 msgid "SFTP for %s on %s"
-msgstr "%s -à %s -à àààà SFTP"
+msgstr "%s à %s à àààà SFTP"
 
 #. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
 msgid "SFTP on %s"
-msgstr "%s -à SFTP"
+msgstr "%s à SFTP"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
@@ -1510,7 +1495,7 @@ msgstr "àààà ààààà ààààà ààà àààà"
 #: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
-msgstr " (àààà ààààààà)"
+msgstr " (àààà ààà'ààà)"
 
 #: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
@@ -1519,7 +1504,7 @@ msgstr "àààààààà"
 #: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
-msgstr "OpenIconForRead-à àààà icon_id '%s'"
+msgstr "OpenIconForRead à àààà icon_id '%s'"
 
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
@@ -1541,7 +1526,7 @@ msgstr "%s à àààà ààààààààà ààààààà"
 #: ../daemon/gvfsbackendsmbbrowse.c:902
 #, c-format
 msgid "Windows shares on %s"
-msgstr "%s -à  Windows àààààààààààà"
+msgstr "%s à  Windows àààààààààààà"
 
 #. translators: We tried to mount a windows (samba) share, but failed
 #: ../daemon/gvfsbackendsmbbrowse.c:1001
@@ -1561,7 +1546,7 @@ msgstr "Windows ààààààà ààààààà àààà"
 #: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
-msgstr "%s -à %s ààààààààà  àààà ààààààààà ààààààà"
+msgstr "%s à %s ààààààààà  àààà ààààààààà ààààààà"
 
 #: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
@@ -1589,7 +1574,7 @@ msgstr "àààà àààààààààà ààà (uint64 ààà
 
 #: ../daemon/gvfsbackendsmb.c:1922
 msgid "Can't rename file, filename already exists"
-msgstr "ààààààà àààà ààààààà àààà àààààà, àààààààààà àààààààà ààààààààààà"
+msgstr "ààààààà àààà àààààà àààà àààààà, àààààààààà àààààààà ààààààààààà"
 
 #: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
@@ -1666,11 +1651,11 @@ msgstr "ààààààà ààààààà ààà"
 
 #: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
-msgstr "àààààà ààààà àààà ààààà"
+msgstr "ààààà ààààà àààà ààààà"
 
 #: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr "àààà ààààà ààààà ààààààà ààààààà ààààààà àààààà àààà àààààààà ààà àààà?"
+msgstr "àààà ààààà ààààà ààààààà ààààààà àààààààà àààààà àààà àààààààà ààà àààà?"
 
 #: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
@@ -1686,11 +1671,11 @@ msgstr "àààààààà àààà ààààààà àààà
 
 #: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
-msgstr "àààààààà àààààààà àààààààà "
+msgstr "àààààààà àààààààà ààààààà "
 
 #: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
-msgstr "àààààà ààà ààà"
+msgstr "àààààà àààààà ààà"
 
 #
 #: ../daemon/gvfsftptask.c:407
@@ -1699,7 +1684,7 @@ msgstr "àààà àààààààà ààà"
 
 #: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
-msgstr "ààààààà àààààà Symlinks ààààààà ààà"
+msgstr "ààààààà àààààà àààààààà ààààà ààààààà ààà"
 
 #: ../daemon/gvfsjobsetattribute.c:120
 msgid "Invalid dbus message"
@@ -1709,9 +1694,9 @@ msgstr "àààà dbus àààààà"
 msgid "Filesystem is busy"
 msgstr "àààààààààààààà  àààààà"
 
-#: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
+#: ../daemon/main.c:45 ../metadata/meta-daemon.c:447
 msgid "Replace old daemon."
-msgstr "ààààà daemon à àààààààà ààà"
+msgstr "ààààà ààààà àààààààà ààà"
 
 #: ../daemon/main.c:46
 msgid "Don't start fuse."
@@ -1723,81 +1708,84 @@ msgstr "GVFS àààà"
 
 #: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
-msgstr "GVFS à àààààà daemon"
+msgstr "GVFS à àààààà àààà"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:472
 #, c-format
 msgid "%s: %s"
-msgstr "%1$s: %2$s"
-
-#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
-#: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
-#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
-#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
-#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
-#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
-#: ../programs/gvfs-tree.c:251
+msgstr "%s: %s"
+
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:474
+#: ../programs/gvfs-cat.c:162 ../programs/gvfs-cat.c:174
+#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:382
+#: ../programs/gvfs-ls.c:409 ../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:1019
+#: ../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
+#: ../programs/gvfs-tree.c:262
 #, c-format
 msgid "Try \"%s --help\" for more information."
-msgstr "àààà àààààà àààà \"%s --help\" ààààààà ààà"
+msgstr "àààà ààààà àààà \"%s --help\" ààààààà ààà"
 
 #: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
 msgstr "spawn ààà ààààààà ààà ààààààà àààààààà àààà"
 
-#: ../daemon/mount.c:779
+#: ../daemon/mount.c:783
 #, c-format
 msgid "Automount failed: %s"
-msgstr "Automount ààà ààààà: %s"
+msgstr "ààààààààà ààà ààààà: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:903
+#: ../daemon/mount.c:829 ../daemon/mount.c:907
 msgid "The specified location is not mounted"
 msgstr "ààààààà ààà ààààà àààààà ààà ààà"
 
-#: ../daemon/mount.c:830
+#: ../daemon/mount.c:834
 msgid "The specified location is not supported"
 msgstr "ààààààà ààà ààààààà ààààààà ààà"
 
-#: ../daemon/mount.c:1045
+#: ../daemon/mount.c:1049
 msgid "Location is already mounted"
 msgstr "ààààààà àààààààà àààààà ààà"
 
-#: ../daemon/mount.c:1053
+#: ../daemon/mount.c:1057
 msgid "Location is not mountable"
 msgstr "ààààààà àààààà ààà ààààà"
 
-#: ../metadata/meta-daemon.c:130 ../metadata/meta-daemon.c:336
-#: ../metadata/meta-daemon.c:390 ../metadata/meta-daemon.c:419
-#: ../metadata/meta-daemon.c:449
+#: ../metadata/meta-daemon.c:135 ../metadata/meta-daemon.c:255
+#: ../metadata/meta-daemon.c:304 ../metadata/meta-daemon.c:339
+#: ../metadata/meta-daemon.c:375
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "àààààààà ààààààà %s àààààà àààà ààààà"
 
-#: ../metadata/meta-daemon.c:160 ../metadata/meta-daemon.c:179
+#: ../metadata/meta-daemon.c:153 ../metadata/meta-daemon.c:165
 msgid "Unable to set metadata key"
-msgstr "àààààààà àààà ààààà ààà ààààà"
+msgstr "àààààààà àà' ààààà ààà ààààà"
 
-#: ../metadata/meta-daemon.c:197 ../metadata/meta-daemon.c:399
+#: ../metadata/meta-daemon.c:175 ../metadata/meta-daemon.c:314
 msgid "Unable to unset metadata key"
-msgstr "àààààààà ààààà àààààààà ààààà ààà ààààà"
+msgstr "àààààààà àà'à àààààààà ààààà ààà ààààà"
 
-#: ../metadata/meta-daemon.c:428
+#: ../metadata/meta-daemon.c:349
 msgid "Unable to remove metadata keys"
-msgstr "àààààààà àààà ààààààà àààààà"
+msgstr "àààààààà àà' ààààààà àààààà"
 
-#: ../metadata/meta-daemon.c:459
+#: ../metadata/meta-daemon.c:386
 msgid "Unable to move metadata keys"
-msgstr "àààààààà àààà àààààààààà ààà ààààà"
+msgstr "àààààààà àà' àààààààààà ààà ààààà"
 
-#: ../metadata/meta-daemon.c:704
+#: ../metadata/meta-daemon.c:457
 msgid "GVFS Metadata Daemon"
 msgstr "GVFS àààààààà àààà"
 
-#: ../metadata/meta-daemon.c:707
+#: ../metadata/meta-daemon.c:460
 msgid "Metadata daemon for GVFS"
 msgstr "GVFS à àààà àààààààààààà  àààààààà àààà"
 
@@ -1809,16 +1797,16 @@ msgstr "GVfs GDU àààà ààààà"
 msgid "Floppy Drive"
 msgstr "ààààà àààààà"
 
-#: ../monitor/gdu/ggdudrive.c:258 ../monitor/udisks2/gvfsudisks2drive.c:201
+#: ../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:203
+#: ../monitor/gdu/ggdudrive.c:260 ../monitor/udisks2/gvfsudisks2drive.c:202
 msgid "Unnamed Drive"
 msgstr "ààà ààààà àààààà"
 
-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:510
+#: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:509
 #, c-format
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr "ààààà ààà àà àààà àààààà àààààà; àààààà ààààà àààààà ààààààà"
@@ -1831,7 +1819,7 @@ msgid ""
 msgstr ""
 "ààààààààà ààààààà àààààà ààààà àààà àààà ?\n"
 "ààààààààà ààààààà àààààà àààààà ààààà, ààààààààà àààààààà àààà ààààà àààààà àààààààà "
-"àààààà à'à'à ààà àààà ààà àààààà ààà ààààààà ààààààà àààà àààà ààààà ààà ààààà"
+"àààààà ààà ààà àààà ààà àààààà ààà ààààààà ààààààà àààà àààà ààààà ààà ààààà"
 
 #: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
@@ -1839,7 +1827,7 @@ msgstr "àààààà ààààà ààà"
 
 #: ../monitor/gdu/ggdumount.c:860 ../monitor/udisks2/gvfsudisks2mount.c:631
 msgid "One or more programs are preventing the unmount operation."
-msgstr "ààà àààà àààà ààààààààà àààààà ààààààààà ààààààà ààààààà àààààààà ààà àààà"
+msgstr "ààà àààà àààà àààààààà àààààà ààààààààà ààààààà ààààààà àààààààà ààà àààà"
 
 #: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
@@ -1860,7 +1848,7 @@ msgid ""
 "Enter a password to unlock the volume\n"
 "The device \"%s\" contains encrypted data on partition %d."
 msgstr ""
-"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"àààà àààà àààà àààà àààààààà àààààààà\n"
 "\"%s\" ààààààà %d ààààààà ààààààààà ààà àààà àààààààààààà"
 
 #: ../monitor/gdu/ggduvolume.c:1104
@@ -1869,17 +1857,16 @@ msgid ""
 "Enter a password to unlock the volume\n"
 "The device \"%s\" contains encrypted data."
 msgstr ""
-"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"àààà àààà àààà àààà àààààààà àààààààà\n"
 "\"%s\" ààààààà ààààààààà ààà àààà àààààààààààà"
 
 #: ../monitor/gdu/ggduvolume.c:1111
-#: ../monitor/udisks2/gvfsudisks2volume.c:1045
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
 "The device %s contains encrypted data."
 msgstr ""
-"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"àààà àààà àààà àààà àààààààà àààààààà\n"
 "%s ààààààà ààààààààà ààà àààà àààààààààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
@@ -2201,6 +2188,10 @@ msgstr "%s ààààààààà ààà àààà"
 msgid "%s Media"
 msgstr "%s àààààà"
 
+#: ../monitor/udisks2/gvfsudisks2mount.c:714
+msgid "Eject Anyway"
+msgstr "àààààà ààààà"
+
 #: ../monitor/udisks2/gvfsudisks2utils.c:494
 #, c-format
 msgid "Timed out running command-line `%s'"
@@ -2209,42 +2200,73 @@ msgstr "àààààà-àààà `%s' àààààà ààààà
 #. Translators: This is used for encrypted volumes.
 #. *              The first %s is the formatted size (e.g. "42.0 MB").
 #.
-#: ../monitor/udisks2/gvfsudisks2volume.c:243
+#: ../monitor/udisks2/gvfsudisks2volume.c:250
 #, c-format
-#| msgid "%s Encrypted Data"
 msgid "%s Encrypted"
 msgstr "%s ààààààààà ààà ààà"
 
 #. Translators: This is used for volume with no filesystem label.
 #. *              The first %s is the formatted size (e.g. "42.0 MB").
 #.
-#: ../monitor/udisks2/gvfsudisks2volume.c:256
+#: ../monitor/udisks2/gvfsudisks2volume.c:263
 #, c-format
 msgid "%s Volume"
 msgstr "%s àààà"
 
 #. Translators: Name used for volume
-#: ../monitor/udisks2/gvfsudisks2volume.c:408
+#: ../monitor/udisks2/gvfsudisks2volume.c:424
 msgid "Volume"
 msgstr "àààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:908
+#: ../monitor/udisks2/gvfsudisks2volume.c:954
+#, c-format
+msgid "Error storing passphrase in keyring (error code %d)"
+msgstr "àà'àààà ààààààààà ààààààà ààààà àààààà (àààààà à'à %d)"
+
+#: ../monitor/udisks2/gvfsudisks2volume.c:985
+#, c-format
+msgid "Error deleting invalid passphrase from keyring (error code %d)"
+msgstr "àà'àààà ààà àààà ààààààààà ààà ààààààà àààààà (àààààà à'à %d)"
+
+#: ../monitor/udisks2/gvfsudisks2volume.c:1048
 msgid "The unlocked device does not have a recognizable filesystem on it"
 msgstr "àààà ààà ààààààà ààààààà àààà ààà ààà àààààààààààààà ààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1031
+#: ../monitor/udisks2/gvfsudisks2volume.c:1077
+#, c-format
+msgid "Encryption passphrase for %s"
+msgstr "%s à àààà ààààààààà ààààààààà"
+
+#: ../monitor/udisks2/gvfsudisks2volume.c:1247
 msgid "A passphrase is required to access the volume"
 msgstr "àààà ààààà àààààà ààà àààààààààà ààààààà"
 
+#. Translators: This is the message shown to users
+#: ../monitor/udisks2/gvfsudisks2volume.c:1262
+#, c-format
+msgid ""
+"Enter a passphrase to unlock the volume\n"
+"The passphrase is needed to access encrypted data on %s."
+msgstr ""
+"àààà àààà àààà àààà ààà ààààààààà àààààààà\n"
+"%s à ààààààààà ààà àààà ààààà àààààà ààààààààààà àààààààààà"
+
+#. drive_icon
+#. media_desc
+#. media_icon
+#. Translators: this is used to describe the drive the encrypted media
+#. * is on - the first %s is the name (such as 'WD 2500JB External'), the
+#. * second %s is the description ('250 GB Hard Disk').
+#.
+#: ../monitor/udisks2/gvfsudisks2volume.c:1413
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
 #: ../monitor/udisks2/udisks2volumemonitordaemon.c:40
-#| msgid "GVfs GDU Volume Monitor"
 msgid "GVfs UDisks2 Volume Monitor"
 msgstr "GVfs UDisks2 àààà àààààààààà"
 
-#: ../programs/gvfs-cat.c:37
-msgid "locations"
-msgstr "ààààààààààà"
-
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
 #: ../programs/gvfs-cat.c:57
@@ -2273,71 +2295,78 @@ msgstr "%s: %s: ààààà àààààà: %s\n"
 msgid "%s: %s:error closing: %s\n"
 msgstr "%s: %s:àààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-cat.c:136
-msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "LOCATION... - LOCATIONS -à àààààààà àààààààà àààààà àààà"
+#: ../programs/gvfs-cat.c:135 ../programs/gvfs-open.c:61
+#: ../programs/gvfs-rm.c:58
+msgid "FILE"
+msgstr "FILE"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-cat.c:141
+#: ../programs/gvfs-cat.c:138
+msgid "Concatenate files and print to the standard output."
+msgstr "ààààààààààà àààààà ààà ààà ààààààààà àààààààà ààààààà àààà"
+
+#: ../programs/gvfs-cat.c:139
 msgid ""
-"Concatenate files at locations and print to the standard output. Works just "
-"like the traditional cat utility, but using gvfs location instead local "
-"files: for example you can use something like smb://server/resource/file.txt "
-"as location to concatenate."
+"gvfs-cat works just like the traditional cat utility, but using gvfs\n"
+"locations instead of local files: for example you can use something\n"
+"like smb://server/resource/file.txt as location."
 msgstr ""
-"àààààààààààà àààààààààààà àààààà ààà ààà ààààààààà àààààààà ààààààà ààààààààààààà cat "
-"ààààààà ààà ààà ààà, àààààà ààààààà àààààààààààà àààààààà gvfs ààààààà ààààààà ààà:"
-"ààààààààààààà ààààà smb://server/resource/file.txt -à ààààààà àààààà ààààààà "
-"àààààààààà ààààààà"
+"gvfs-cat ààààààààà cat ààààààà àààààà ààààààà ààà, àààà ààààààà àààààààààààà àààààààà\n"
+"gvfs ààààààààààà ààààààà ààà: àààààààààààà ààààà smb://server/resource/file.txt "
+"à àààààà àààà àààà ààààààà àààààà ààààààà àààà àààààà"
 
-#: ../programs/gvfs-cat.c:148
+#: ../programs/gvfs-cat.c:143
 msgid ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
+"Note: just pipe through cat if you need its formatting options\n"
+"like -n, -T or other."
 msgstr ""
-"àààà: cat -à àààà pipe ààà ààà ààààà àààà ààààààà àààààà àààà  -n, -T àààà àààà "
-"ààààààà"
-
-#: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
-#: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
-#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
-#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
-#: ../programs/gvfs-tree.c:249
+"àà àààà: cat àà pipe ààà ààà ààààà àààà ààààààà àààààààààà àààààà\n"
+"àààà -n, -T àààà ààààà"
+
+#: ../programs/gvfs-cat.c:160 ../programs/gvfs-copy.c:131
+#: ../programs/gvfs-info.c:380 ../programs/gvfs-ls.c:407
+#: ../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:1017 ../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-tree.c:260
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "àààààà-ààààà ààà àààààààààààà àààààà àààààààà ààààà àààààà: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
+#: ../programs/gvfs-cat.c:172 ../programs/gvfs-open.c:88
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: ààààààà ààà"
 
 #: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
-msgid "no target directory"
-msgstr "àààààà ààààààààà ààà"
+msgid "No target directory"
+msgstr "àààà àààààà ààààààààà ààà"
 
 #: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
-msgid "show progress"
+msgid "Show progress"
 msgstr "àààààà àààààààà"
 
 #: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
-msgid "prompt before overwrite"
+msgid "Prompt before overwrite"
 msgstr "àààààà ààààà àààààà ààààà ààà"
 
 #: ../programs/gvfs-copy.c:47
-msgid "preserve all attributes"
+msgid "Preserve all attributes"
 msgstr "àààà ààààààààà àààààààààà àààà"
 
 #: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
-msgid "backup existing destination files"
-msgstr "àààààààà ààààààààààà àààààààààààà ààààààààààà ààààà ààà"
+#: ../programs/gvfs-save.c:43
+msgid "Backup existing destination files"
+msgstr "ààààààààààà ààààààà àààààààààààà ààààà ààà"
 
 #: ../programs/gvfs-copy.c:49
-msgid "never follow symbolic links"
+msgid "Never follow symbolic links"
 msgstr "àààààààà àààà ààààààà àààààà ààààà"
 
 #: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
@@ -2345,29 +2374,39 @@ msgstr "àààààààà àààà ààààààà àààà
 msgid "progress"
 msgstr "àààààà"
 
-#: ../programs/gvfs-copy.c:115
-msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
-msgstr "SOURCE... DEST - ààààààààààà àààà ààà ààààààààà ààà ààà"
+#: ../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
+msgid "DEST"
+msgstr "DEST"
 
-#: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
+#: ../programs/gvfs-copy.c:122
+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-rename.c:83
 msgid "Missing operand\n"
 msgstr "àààààààà ààààààààà\n"
 
-#: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 msgid "Too many arguments\n"
 msgstr "àààààà àààà\n"
 
-#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
+#: ../programs/gvfs-copy.c:158 ../programs/gvfs-move.c:146
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "%s àààààààààà ààà ààààààààà ààà\n"
 
-#: ../programs/gvfs-copy.c:193
+#: ../programs/gvfs-copy.c:203
 #, c-format
 msgid "overwrite %s?"
 msgstr "%s àààààà àààà à'à àààà ?"
 
-#: ../programs/gvfs-copy.c:207
+#: ../programs/gvfs-copy.c:217
 #, c-format
 msgid "Error copying file %s: %s\n"
 msgstr "%s ààààààà ààà ààààà àààààà: %s\n"
@@ -2384,9 +2423,13 @@ msgstr "àààààààààààààà àààà ààààà
 msgid "The attributes to get"
 msgstr "ààààààà àààà àààà ààààààà ààààààààà"
 
+#: ../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-set-attribute.c:37
-msgid "Don't follow symlinks"
+msgid "Don't follow symbolic links"
 msgstr "àààààààà àààà àààààà ààààà"
 
 #: ../programs/gvfs-info.c:50
@@ -2479,9 +2522,17 @@ msgstr "ààààààààààààà àààààààààà
 msgid "Writable attribute namespaces:\n"
 msgstr "ààààà ààààà àààààààààà ààààààààààààà:\n"
 
-#: ../programs/gvfs-info.c:362
-msgid "- show info for <location>"
-msgstr "<location> -à àààà àààààààà"
+#: ../programs/gvfs-info.c:368 ../programs/gvfs-ls.c:390
+#: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-monitor-dir.c:112
+#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1005
+#: ../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:369
+msgid "Show information about locations."
+msgstr "àààààààààààà ààààà àààà àààààààà"
 
 #: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
@@ -2495,15 +2546,32 @@ msgstr "ààà àààà ààààààààààà ààààà
 msgid "Show completions"
 msgstr "àààààààà àààà àààà àààà àààààààà"
 
+#: ../programs/gvfs-ls.c:42
+msgid "PREFIX"
+msgstr "PREFIX"
+
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
-#: ../programs/gvfs-rename.c:69
+#: ../programs/gvfs-rename.c:97
 #, c-format
 msgid "Error: %s\n"
 msgstr "àààààà: %s\n"
 
-#: ../programs/gvfs-ls.c:383
-msgid "- list files at <location>"
-msgstr "<location> à ààààààààààà ààààààààààà ààààààààààà ààà"
+#: ../programs/gvfs-ls.c:391
+msgid "List the contents of the locations."
+msgstr "àààààààààààà ààààààà ààààààààààà àààà"
+
+#: ../programs/gvfs-ls.c:392
+msgid ""
+"gvfs-ls is similar to the traditional ls utility, but using gvfs\n"
+"locations instead of local files: for example you can use something\n"
+"like smb://server/resource/file.txt as location. File attributes can\n"
+"be specified with their gvfs name, e.g. standard::icon."
+msgstr ""
+"gvfs-ls ààààààààà ls ààààààà àààà àààà, àààààà ààààààà àààààààààààà àààààààà\n"
+"gvfs ààààààààààà ààààààà ààà: àààààààààààà ààààà smb://server/resource/file.txt\n"
+"à àààààà àààà àààà ààààààà àààààà ààààààà àààà àààààà ààààààà ààààààààààà ààààà gvfs "
+"àààà\n"
+"àààà ààààààà àààà àààà, àààààààààààà standard::iconà"
 
 #: ../programs/gvfs-mime.c:36
 msgid "Query handler for mime-type"
@@ -2513,208 +2581,223 @@ msgstr "àààà-àààà àààà àààààà àààà
 msgid "Set handler for mime-type"
 msgstr "àààà-àààà àààà àààààààààà ààààà ààà"
 
-#: ../programs/gvfs-mime.c:76
-msgid "- get/set handler for <mimetype>"
-msgstr "<mimetype> -à àààà àààààààààà - ààààààà ààà/ààààà ààà"
+#: ../programs/gvfs-mime.c:82
+msgid "MIMETYPE"
+msgstr "MIMETYPE"
 
-#: ../programs/gvfs-mime.c:85
-msgid "Specify one of --query and --set"
-msgstr "--query ààà --set -à ààà ààààààà ààà"
+#: ../programs/gvfs-mime.c:82
+msgid "HANDLER"
+msgstr "HANDLER"
 
-#: ../programs/gvfs-mime.c:97
+#: ../programs/gvfs-mime.c:83
+msgid "Get or set the handler for a mime-type."
+msgstr "ààà àààà-àààà àààà àààààààààà ààààààà àààà ààààà àààà"
+
+#: ../programs/gvfs-mime.c:95
+msgid "Specify either --query or --set"
+msgstr "--query àààà --set à àààààà ààà ààààààà ààà"
+
+#: ../programs/gvfs-mime.c:106
 #, c-format
 msgid "Must specify a single mime-type.\n"
 msgstr "ààà àààà-ààà ààààààà àààà àààààà\n"
 
-#: ../programs/gvfs-mime.c:105
+#: ../programs/gvfs-mime.c:113
 #, c-format
 msgid "Must specify the mime-type followed by the default handler.\n"
-msgstr "ààààààààà àààààààààààà àààààà ààà àààà-ààà ààààààà àààà àààààà\n"
+msgstr "ààààààààà àààààààààààà àààààà ààà àààà-ààà ààààààà àààà àààààà\n"
 
-#: ../programs/gvfs-mime.c:121
+#: ../programs/gvfs-mime.c:128
 #, c-format
 msgid "No default applications for '%s'\n"
-msgstr "'%s' -à àààà àààà ààààààà ààààààààà ààà\n"
+msgstr "'%s' à àààà àààà ààààààà ààààààààà ààà\n"
 
-#: ../programs/gvfs-mime.c:127
+#: ../programs/gvfs-mime.c:134
 #, c-format
 msgid "Default application for '%s': %s\n"
-msgstr "'%s' -à àààà ààààààà ààààààààà: %s\n"
+msgstr "'%s' à àààà ààààààà ààààààààà: %s\n"
 
-#: ../programs/gvfs-mime.c:132
+#: ../programs/gvfs-mime.c:139
 #, c-format
 msgid "Registered applications:\n"
 msgstr "ààààààààà ààà ààààààààààààà:\n"
 
-#: ../programs/gvfs-mime.c:134
+#: ../programs/gvfs-mime.c:141
 #, c-format
-#| msgid "Registered applications:\n"
 msgid "No registered applications\n"
 msgstr "àààà ààààààààà ààà ààààààààà ààà\n"
 
-#: ../programs/gvfs-mime.c:145
+#: ../programs/gvfs-mime.c:152
 #, c-format
-#| msgid "Registered applications:\n"
 msgid "Recommended applications:\n"
 msgstr "ààààààà ààààààààààààà:\n"
 
-#: ../programs/gvfs-mime.c:147
+#: ../programs/gvfs-mime.c:154
 #, c-format
-#| msgid "Registered applications:\n"
 msgid "No recommended applications\n"
 msgstr "àààà ààààààà ààààààààà ààà\n"
 
-#: ../programs/gvfs-mime.c:167
+#: ../programs/gvfs-mime.c:174
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
-msgstr "àààààààààà '%s' -à àààà àààà à'à àààààà àààààà\n"
+msgstr "àààààààààà '%s' à àààà àààà à'à àààààà àààààà\n"
 
-#: ../programs/gvfs-mime.c:173
+#: ../programs/gvfs-mime.c:180
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
-msgstr "'%s' -à àààà  '%s' -à ààààààààà àààààààààà àààààà ààààà àààààà àààààà: %s\n"
+msgstr "'%s' à àààà  '%s' à ààààààààà àààààààààà àààààà ààààà àààààà àààààà: %s\n"
 
 #: ../programs/gvfs-mkdir.c:33
-msgid "create parent directories"
+msgid "Create parent directories"
 msgstr "àààààà ààààààààààààà àààààà ààà"
 
-#: ../programs/gvfs-mkdir.c:51
-msgid "- create directories"
-msgstr "ààààààààààààà àààààà ààà"
+#: ../programs/gvfs-mkdir.c:58
+msgid "Create directories."
+msgstr "ààààààààààààà àààààà àààà"
 
-#: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
+#: ../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
-msgid "Don't send single MOVED events."
-msgstr "àààà MOVED àààààààà àààààà"
+msgid "Don't send single MOVED events"
+msgstr "àààà MOVED àààààààà ààààà"
 
-#: ../programs/gvfs-mount.c:54
-msgid "Mount as mountable"
-msgstr "àààààà àààà ààààà àààààà  àààààà ààà"
+#: ../programs/gvfs-monitor-dir.c:113
+msgid "Monitor directories for changes."
+msgstr "ààààààààààààà ààààààààà àààà àààààààààà àààà"
+
+#: ../programs/gvfs-monitor-file.c:112
+msgid "Monitor files for changes."
+msgstr "ààààààààààà ààààààààà àààà àààààààààà àààà"
 
 #: ../programs/gvfs-mount.c:55
+msgid "Mount as mountable"
+msgstr "àààààà àààà ààààà àààààà àààààà ààà"
+
+#: ../programs/gvfs-mount.c:56
 msgid "Mount volume with device file"
 msgstr "àààààà ààààààà àààààà àààà àààààà ààà"
 
 #: ../programs/gvfs-mount.c:56
+msgid "DEVICE"
+msgstr "DEVICE"
+
+#: ../programs/gvfs-mount.c:57
 msgid "Unmount"
 msgstr "àààààààà ààà"
 
-#: ../programs/gvfs-mount.c:57
+#: ../programs/gvfs-mount.c:58
+msgid "Eject"
+msgstr "ààààààà"
+
+#: ../programs/gvfs-mount.c:59
 msgid "Unmount all mounts with the given scheme"
 msgstr "àààààààà ààààà àà àààà àààààà àààààààà ààà"
 
-#. Translator: List here is a verb as in 'List all mounts'
 #: ../programs/gvfs-mount.c:59
+msgid "SCHEME"
+msgstr "SCHEME"
+
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:61
 msgid "List"
 msgstr "àààààà"
 
-#: ../programs/gvfs-mount.c:60
-msgid "Show extra information for List and Monitor"
-msgstr "àààààà ààà ààààà àààààààà àààààààà àààà àààààààà"
-
-#: ../programs/gvfs-mount.c:61
+#: ../programs/gvfs-mount.c:62
 msgid "Monitor events"
 msgstr "àààààààà àààààààà ààà"
 
-#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
+#: ../programs/gvfs-mount.c:63
+msgid "Show extra information"
+msgstr "àààààààà àààà àààààààà"
+
+#: ../programs/gvfs-mount.c:166 ../programs/gvfs-mount.c:187
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "ààààààà àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:242
+#: ../programs/gvfs-mount.c:244
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "àààààà àààààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:263
+#: ../programs/gvfs-mount.c:265 ../programs/gvfs-mount.c:310
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "àààààà àààààà àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:289
+#, c-format
+msgid "Error ejecting mount: %s\n"
+msgstr "àààààà àààààààà àààààà: %s\n"
+
+#: ../programs/gvfs-mount.c:743
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "%s àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:710
+#: ../programs/gvfs-mount.c:757
 #, c-format
 msgid "Mounted %s at %s\n"
-msgstr "%s -à %s à àààààà ààà àààà\n"
+msgstr "%s à %s à àààààà ààà àààà\n"
 
-#: ../programs/gvfs-mount.c:761
+#: ../programs/gvfs-mount.c:808
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "àààààà ààààààà %s à àààà àààà àààà ààààààà ààà\n"
 
-#: ../programs/gvfs-mount.c:952
-msgid "- mount <location>"
-msgstr "<location> àààààà ààà"
+#: ../programs/gvfs-mount.c:1006
+msgid "Mount the locations."
+msgstr "ààààààààààà àààààà àààà"
 
-#: ../programs/gvfs-move.c:103
-msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
-msgstr "SOURCE... DEST - ààààààààààà àààà ààà ààààààààà àààààààààà ààà"
+#: ../programs/gvfs-move.c:110
+msgid "Move one or more files from SOURCE to DEST."
+msgstr "ààà àà àààà ààààààààààà SOURCE à ààà DEST àà àààààààààà àààà"
 
-#: ../programs/gvfs-move.c:189
+#: ../programs/gvfs-move.c:199
 #, c-format
 msgid "Error moving file %s: %s\n"
 msgstr "%s ààààààà àààààààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-open.c:37
-msgid "files"
-msgstr "ààààààààààà"
+#. Translators: this message will appear after the usage string
+#. and before the list of options.
+#: ../programs/gvfs-open.c:64
+msgid ""
+"Open files with the default application that\n"
+"is registered to handle files of this type."
+msgstr ""
+"àà àààà ààààààà ààààààààààà àààààà ààààààààààà ààààààààà\n"
+"àààààààààà àààà ààààààààààà ààààà"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:65
+#: ../programs/gvfs-open.c:120
 #, c-format
 msgid "%s: %s: error opening location: %s\n"
 msgstr "%s: %s: ààààààà àààààà àààààà: %s\n"
 
-#. Translators: the first %s is the program name, the second one
-#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:92
-#, c-format
-msgid "%s: %s: error launching application: %s\n"
-msgstr "%s: %s: ààààààààà ààààà ààààà àààààà: %s\n"
-
-#: ../programs/gvfs-open.c:123
-msgid "FILES... - open FILES with registered application."
-msgstr "FILES... - ààààààààààà àààààààààààààà àààà FILES ààààà"
+#: ../programs/gvfs-rename.c:64
+msgid "NEW-NAME"
+msgstr "NEW-NAME"
 
-#. Translators: this message will appear after the usage string
-#. and before the list of options.
-#: ../programs/gvfs-open.c:127
-msgid ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
-msgstr ""
-"ààààààà ààà ààààààààààà àààààà ààààààààààà ààààààààà àààààààààà àààà ààààààà(àààà) "
-"ààààà "
+#: ../programs/gvfs-rename.c:65
+msgid "Rename a file."
+msgstr "ààà ààààààà àààààààààà àààà"
 
-#: ../programs/gvfs-rename.c:50
-msgid "- rename file"
-msgstr "- ààààààà àààà ààààààà ààà"
-
-#: ../programs/gvfs-rename.c:76
+#: ../programs/gvfs-rename.c:104
 #, c-format
 msgid "Rename successful. New uri: %s\n"
-msgstr "ààààààà àààà àààà ààààààà ààà ààààà àààà uri: %s\n"
-
-#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
-msgid "ignore nonexistent files, never prompt"
-msgstr "àààà ààààààà ààààààà ààà, ààààààà ààààà ààààà"
+msgstr "ààààààà àààà àààà àààààà ààà ààààà àààà uri: %s\n"
 
-#: ../programs/gvfs-rm.c:53
-msgid "- delete files"
-msgstr "- ààààààààààà ààà àààààà"
+#: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:34
+msgid "Ignore nonexistent files, never prompt"
+msgstr "àààààààà ààààà ààààààààààà ààààààà ààà, ààààààà ààààààà"
 
-#: ../programs/gvfs-save.c:43
-msgid "Create backup"
-msgstr "ààààà àààààà ààà"
+#: ../programs/gvfs-rm.c:59
+msgid "Delete the given files."
+msgstr "àààààà ààà ààààààààààà ààà ààààààà"
 
 #: ../programs/gvfs-save.c:44
 msgid "Only create if not existing"
@@ -2725,8 +2808,8 @@ msgid "Append to end of file"
 msgstr "àààààààà àààà ààà ààà"
 
 #: ../programs/gvfs-save.c:46
-msgid "When creating a file, restrict access to the current user only"
-msgstr "ààààààà ààààààà ààà, ààà ààààààà àààààààààààà àààà àààààààà àààààà ààààà ààà"
+msgid "When creating, restrict access to the current user"
+msgstr "àààààà ààààà, ààààà àààà ààààààà àààààààààààà àààà àààà"
 
 #: ../programs/gvfs-save.c:47
 msgid "Print new etag at end"
@@ -2736,6 +2819,10 @@ msgstr "àààà àààà etag ààààààà ààà"
 msgid "The etag of the file being overwritten"
 msgstr "àààààà ààààà àààà ààààààà àààààààà etag"
 
+#: ../programs/gvfs-save.c:48
+msgid "ETAG"
+msgstr "ETAG"
+
 #: ../programs/gvfs-save.c:76
 #, c-format
 msgid "Error opening file: %s\n"
@@ -2755,63 +2842,108 @@ msgstr "àààà ààààà àààààà: %s\n"
 msgid "Etag not available\n"
 msgstr "Etag àààààà ààà\n"
 
-#: ../programs/gvfs-save.c:156
-msgid "DEST - read from standard input and save to DEST"
-msgstr "DEST - ààààààààà àààààà ààà ààà ààà àààààààà ààààààà ààà"
+#: ../programs/gvfs-save.c:163
+msgid "Read from standard input and save to DEST."
+msgstr "ààààààààà àààààà ààà ààà ààà DEST àà ààààààà àààà"
 
 #: ../programs/gvfs-set-attribute.c:36
-msgid ""
-"attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv, unset]"
-msgstr ""
-"àààààààààà ààà [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv]"
+msgid "Type of the attribute"
+msgstr "àààààààà ààà"
+
+#: ../programs/gvfs-set-attribute.c:36
+msgid "TYPE"
+msgstr "TYPE"
 
-#: ../programs/gvfs-set-attribute.c:119
-msgid " <location> <attribute> <values> - set attribute"
-msgstr " <location> <attribute> <values> - ààààààààà ààààà ààà"
+#: ../programs/gvfs-set-attribute.c:139
+msgid "ATTRIBUTE"
+msgstr "ATTRIBUTE"
 
-#: ../programs/gvfs-set-attribute.c:137
-#, c-format
+#: ../programs/gvfs-set-attribute.c:139
+msgid "VALUE"
+msgstr "VALUE"
+
+#: ../programs/gvfs-set-attribute.c:140
+msgid "Set a file attribute of LOCATION."
+msgstr "LOCATION à ààà ààààààà ààààààà ààààà àààà"
+
+#: ../programs/gvfs-set-attribute.c:159
 msgid "Location not specified\n"
 msgstr "ààààààà ààààààà ààà àààà ààà\n"
 
-#: ../programs/gvfs-set-attribute.c:145
-#, c-format
+#: ../programs/gvfs-set-attribute.c:167
 msgid "Attribute not specified\n"
 msgstr "ààààààààà ààààààà ààà àààà ààà\n"
 
-#: ../programs/gvfs-set-attribute.c:154
-#, c-format
+#: ../programs/gvfs-set-attribute.c:176
 msgid "Value not specified\n"
 msgstr "ààà ààààààà ààà àààà ààà\n"
 
-#: ../programs/gvfs-set-attribute.c:194
+#: ../programs/gvfs-set-attribute.c:219
 #, c-format
 msgid "Invalid attribute type %s\n"
 msgstr "àààààààààà ààà %s àààà\n"
 
-#: ../programs/gvfs-set-attribute.c:204
+#: ../programs/gvfs-set-attribute.c:229
 #, c-format
 msgid "Error setting attribute: %s\n"
 msgstr "ààààààààà ààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-trash.c:52
-msgid "- move files to trash"
-msgstr "- ààààààààààà àààààààà àààààààààà ààà"
+#: ../programs/gvfs-trash.c:58
+msgid "Move files or directories to the trash."
+msgstr "ààààààààààà àààà àààààààààààààà ààààààààà àààààààààà àààà"
 
-#: ../programs/gvfs-trash.c:69
+#: ../programs/gvfs-trash.c:89
 #, c-format
 msgid "Error trashing file: %s\n"
-msgstr "àààààààà ààààààà ààààà àààààà: %s\n"
+msgstr "àààààààà àààààààà àààààà àààààà: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symbolic links, mounts and shortcuts like directories"
-msgstr "àààààààà ààààà, àààààà ààà ààààààà àààà ààààààààààààà àààààà ààà"
+msgid "Follow symbolic links, mounts and shortcuts"
+msgstr "àààààààà ààààààààà, àààààààààà ààà ààààààààààà àààààà ààà"
+
+#: ../programs/gvfs-tree.c:249
+msgid "List contents of directories in a tree-like format."
+msgstr "ààà àààà àààààà àààààààà àààààààààà ààààààà ààààààààààà àààà"
+
+#~ msgid "locations"
+#~ msgstr "ààààààààààà"
+
+#~ msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
+#~ msgstr "SOURCE... DEST - ààààààà(àààà) SOURCE à ààà DEST àà ààà ààà"
+
+#~ msgid "- list files at <location>"
+#~ msgstr "<location> à ààààààààààà ààààààààààà ààààààààààà ààà"
+
+#~ msgid "- get/set handler for <mimetype>"
+#~ msgstr "<mimetype> à àààà àààààààààà - ààààààà ààà/ààààà ààà"
+
+#~ msgid "files"
+#~ msgstr "ààààààààààà"
+
+#~ msgid "%s: %s: error launching application: %s\n"
+#~ msgstr "%s: %s: ààààààààà ààààà ààààà àààààà: %s\n"
+
+#~ msgid "FILES... - open FILES with registered application."
+#~ msgstr "FILES... - ààààààààààà àààààààààààààà àààà FILES ààààà"
+
+#~ msgid "- delete files"
+#~ msgstr "- ààààààààààà ààà àààààà"
+
+#~ msgid "Create backup"
+#~ msgstr "ààààà àààààà ààà"
+
+#~ msgid ""
+#~ "attribute type [string, bytestring, boolean, uint32, int32, uint64, "
+#~ "int64, stringv, unset]"
+#~ msgstr ""
+#~ "àààààààààà ààà [string, bytestring, boolean, uint32, int32, uint64, int64, "
+#~ "stringv]"
+
+#~ msgid " <location> <attribute> <values> - set attribute"
+#~ msgstr " <location> <attribute> <values> - ààààààààà ààààààà ààà"
 
-#: ../programs/gvfs-tree.c:242
-msgid "- list contents of directories in a tree-like format"
-msgstr "- ààààà àààààà àààààààà àààààààààà ààààààà ààààààààààà ààà"
+#~ msgid "- move files to trash"
+#~ msgstr "- ààààààààààà àààààààà àààààààààà ààà"
 
 #~ msgid "Server doesn't support passwords longer than 256 characters"
 #~ msgstr "àààààààà ààà àààààà àààà àààààààààààà àààààà àààà"
@@ -2824,11 +2956,11 @@ msgstr "- ààààà àààààà àààààààà ààà
 
 #~| msgid "sftp for %s on %s"
 #~ msgid "AFP shares for %s on %s"
-#~ msgstr "%s -à %s -à àààà AFP àààààààààààà"
+#~ msgstr "%s à %s à àààà AFP àààààààààààà"
 
 #~| msgid "Windows shares on %s"
 #~ msgid "AFP shares on %s"
-#~ msgstr "%s -à AFP àààààààààààà"
+#~ msgstr "%s à AFP àààààààààààà"
 
 #~| msgid "File is directory"
 #~ msgid "File is a directory"
@@ -2848,13 +2980,13 @@ msgstr "- ààààà àààààà àààààààà ààà
 #~ msgstr "ààààààààààà SBServices ààààààà àààààà (%d) "
 
 #~ msgid "ftp on %s"
-#~ msgstr "%s -à ftp"
+#~ msgstr "%s à ftp"
 
 #~ msgid "Error renaming dir"
-#~ msgstr "àààààààààà àààà ààààààà ààààà àààààà"
+#~ msgstr "àààààààààà àààà àààààà ààààà àààààà"
 
 #~ msgid "sftp on %s"
-#~ msgstr "%s -à sftp"
+#~ msgstr "%s à sftp"
 
 #~ msgid "Service %d on Apple Mobile Device"
 #~ msgstr "Apple àààààà ààààààà %d àààà"
@@ -2885,7 +3017,7 @@ msgstr "- ààààà àààààà àààààààà ààà
 
 #
 #~ msgid "Enter password"
-#~ msgstr "àààààààà àààààà"
+#~ msgstr "àààààààà àààààààà"
 
 #~ msgid "- output files at <location>"
 #~ msgstr "- <location> à ààààààà àààààà ààààààà"
@@ -2894,7 +3026,7 @@ msgstr "- ààààà àààààà àààààààà ààà
 #~ msgstr "ààààààààà ààààà"
 
 #~ msgid "Could not connect to host"
-#~ msgstr "àààààà àààà ààààà ààààààà àààààà"
+#~ msgstr "ààààà àààà ààààà ààààààà àààààà"
 
 #~ msgid "filename too long"
 #~ msgstr "àààààà ààà àààààà àààà"



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