[gvfs] Updated Assamese Translations:bugzilla#659595



commit 82bdb754ffb6b73acd3e165bc602d24d2e6b39f8
Author: Nilamdyuti Goswami <ngoswami redhat com>
Date:   Sat Sep 24 16:50:44 2011 +0530

    Updated Assamese Translations:bugzilla#659595

 po/as.po | 1922 +++++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1150 insertions(+), 772 deletions(-)
---
diff --git a/po/as.po b/po/as.po
index 3820ac6..11dbc59 100644
--- a/po/as.po
+++ b/po/as.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: as\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.";
-"cgi?product=gvfs&component=general\n"
-"POT-Creation-Date: 2011-01-24 02:02+0000\n"
-"PO-Revision-Date: 2011-03-15 17:33+0000\n"
+"cgi?product=gvfs&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-09-19 14:53+0000\n"
+"PO-Revision-Date: 2011-09-21 19:17+0530\n"
 "Last-Translator: Nilamdyuti Goswami <ngoswami redhat com>\n"
 "Language-Team: Assamese <kde-i18n-doc kde org>\n"
 "MIME-Version: 1.0\n"
@@ -18,57 +18,56 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2376
+#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
-msgstr "àà àààà àààààààà, ààààààààààà àààà ààààààà ààààààà"
+msgstr "àà ààààààà àààààààà, ààààààààààà àààà ààààààà ààààààà"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:868 ../client/gdaemonfile.c:902
-#: ../client/gdaemonfile.c:1017 ../client/gdaemonfile.c:1096
-#: ../client/gdaemonfile.c:1159 ../client/gdaemonfile.c:1222
-#: ../client/gdaemonfile.c:1288 ../client/gdaemonfile.c:1350
-#: ../client/gdaemonfile.c:1367 ../client/gdaemonfile.c:1851
-#: ../client/gdaemonfile.c:1880 ../client/gdaemonfile.c:2036
-#: ../client/gdaemonfile.c:2536 ../client/gdaemonfile.c:2585
-#: ../client/gdaemonfile.c:2649 ../client/gdaemonfile.c:2733
-#: ../client/gdaemonfile.c:2808 ../client/gdaemonfile.c:2996
-#: ../client/gdaemonfile.c:3076 ../client/gvfsiconloadable.c:145
+#: ../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/gvfsiconloadable.c:374
 #, c-format
-#| msgid "Invalid return value from open"
 msgid "Invalid return value from %s"
 msgstr "%s -à ààà àààà ààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:985 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
-msgstr "ààààààà àààààààà ààààààààààààà ààà ààààà ààà"
+msgstr "ààààààà àààààààà ààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:1106 ../client/gdaemonfile.c:1169
-#: ../client/gdaemonfile.c:1232 ../client/gdaemonfile.c:1298
-#: ../client/gdaemonfile.c:2615 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
-msgstr "ààààààà àààààààà ààààààààààààà ààà ààààà ààà"
+msgstr "ààààààà àààààààà ààààà àààà ààà"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1964
+#: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
-msgstr "ààààààààà àààààà ààààà ààà ààààà"
+msgstr "ààààà àààààà àààà ààà"
 
-#: ../client/gdaemonfile.c:1994
+#: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
-msgstr "àààààààà ààà àààà: %s"
+msgstr "àààà ààààààà: %s"
 
-#: ../client/gdaemonfile.c:2232 ../client/gdaemonvfs.c:1200
-#: ../client/gdaemonvfs.c:1335 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1199
+#: ../client/gdaemonvfs.c:1334 ../client/gdaemonvfs.c:1387
 #, c-format
 msgid "Error setting file metadata: %s"
-msgstr "àààààààà àààà-àààà àààààààà àààààà àààààà: %s"
+msgstr "àààààààà àààààààà ààààà ààààà àààààà: %s"
 
-#: ../client/gdaemonfile.c:2233 ../client/gdaemonvfs.c:1389
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
 msgid "values must be string or list of strings"
-msgstr "ààààààà àààà àààààààà àààààà àààà ààà àààààà"
+msgstr "ààà ààààààà àààà àààààààà àààààà àà ààààà "
 
 #
 #: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
@@ -81,24 +80,24 @@ msgstr "ààààààà àààà àààààààà àààà
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1050
-#: ../daemon/gvfsbackendobexftp.c:1087 ../daemon/gvfsbackendobexftp.c:1108
-#: ../daemon/gvfsbackendobexftp.c:1227 ../daemon/gvfsbackendobexftp.c:1364
-#: ../daemon/gvfsbackendobexftp.c:1428 ../daemon/gvfsbackendobexftp.c:1630
-#: ../daemon/gvfsbackendobexftp.c:1737 ../daemon/gvfsbackendobexftp.c:1899
-#: ../daemon/gvfsbackendobexftp.c:1926 ../daemon/gvfsbackendobexftp.c:1985
-#: ../daemon/gvfsbackendobexftp.c:2007 ../daemon/gvfsbackendobexftp.c:2070
-#: ../daemon/gvfsbackendobexftp.c:2089 ../daemon/gvfsbackendsmb.c:1170
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../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:319
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
 #: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
 #: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
 #: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
 #: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
 #: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
 msgid "Operation was cancelled"
-msgstr "àààà ààààà ààà àààà"
+msgstr "ààààààà ààààà ààà ààààà"
 
 #: ../client/gdaemonfileinputstream.c:527
 #: ../client/gdaemonfileinputstream.c:535
@@ -110,7 +109,7 @@ msgstr "àààà ààààà ààà àààà"
 #: ../client/gdaemonfileoutputstream.c:1246
 #, c-format
 msgid "Error in stream protocol: %s"
-msgstr "ààààààà ààààààà à àààààà ààààà: %s"
+msgstr "ààààààà àààààààà àààààà: %s"
 
 #: ../client/gdaemonfileinputstream.c:535
 #: ../client/gdaemonfileinputstream.c:1694
@@ -123,49 +122,49 @@ msgstr "àààààààà àààààà"
 #: ../client/gdaemonfileinputstream.c:1330
 #: ../client/gdaemonfileoutputstream.c:981
 msgid "Seek not supported on stream"
-msgstr "ààààààà àààààà Seek ààààààà àà àà"
+msgstr "ààààààà àààààà Seek ààààààà ààà"
 
-#: ../client/gdaemonvfs.c:832
+#: ../client/gdaemonvfs.c:831
 #, c-format
 msgid "Error while getting mount info: %s"
-msgstr "àààààààà àààààà àààààààààà àààààà: %s"
+msgstr "ààààààà àààà ààààààà ààààà àààààà: %s"
 
-#: ../client/gdaemonvfs.c:1201
+#: ../client/gdaemonvfs.c:1200
 msgid "Can't contact session bus"
 msgstr "ààààààà àààà àààà ààààà ààààààà àààààà"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1004
+#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
 #, c-format
 msgid "Error connecting to daemon: %s"
-msgstr "daemon à àààà àààààà àààààà:%s"
+msgstr "ààààà àààà àààààà àààààà:%s"
 
 #: ../common/gsysutils.c:136
 #, c-format
 msgid "Error creating socket: %s"
-msgstr "socket àààààà àààààà àààààà: %s"
+msgstr "àààà àààààà ààààà àààààà: %s"
 
 #: ../common/gsysutils.c:174
 #, c-format
 msgid "Error connecting to socket: %s"
-msgstr "socket à ààààà àààààà àààààà: %s"
+msgstr "ààààà ààà ààààà ààààà àààààà: %s"
 
-#: ../common/gvfsdaemonprotocol.c:522
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
-msgstr "àààààààà ààààààà ààààààà àààà ààà"
+msgstr "àààà ààààààà àààà ààààààà"
 
-#: ../common/gvfsdaemonprotocol.c:540
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
-msgstr "info list content ààààààààà àààà ààà"
+msgstr "àààà ààààààà àààà àààààà ààà"
 
 #: ../common/gvfsdnssdresolver.c:209
 #, c-format
 msgid "Error initializing Avahi: %s"
-msgstr "Avahi ààààà àààààà àààààà: %s"
+msgstr "Avahi ààààà ààààà àààààà: %s"
 
 #: ../common/gvfsdnssdresolver.c:255
 #, c-format
 msgid "Error creating Avahi resolver: %s"
-msgstr "Avahi àààààààà ààààààà àààààà àààààà: %s"
+msgstr "Avahi àààààààààà àààààà ààààà àààààà: %s"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -175,7 +174,7 @@ msgstr "Avahi àààààààà ààààààà àààààà
 #: ../common/gvfsdnssdresolver.c:1100
 #, c-format
 msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\""
-msgstr "\"%s\" ààààààà àààààà àààààà,  \"%s\" ààààààà \"%s\" ààààààà ààààà"
+msgstr "\"%s\" àààààà ààààà àààààà,  \"%s\" àààà \"%s\" ààààààà ààààà"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -189,8 +188,8 @@ 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\" àààà \"%s\" àààààà ààààà ààààààà ààà àààà àààà TXT "
+"àààààà àààà àààààà àà: \"%s\"à"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -200,145 +199,195 @@ 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' ààààààààààà"
+msgstr "ààààààààààà dns-sd encoded triple '%s' (_t) "
 
 #: ../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:76 ../daemon/daemon-main.c:230
+#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
 #, 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"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:97
 #, c-format
 msgid "%s Filesystem Service"
-msgstr "%s ààààààà-ààààààà ààààààà"
+msgstr "%s àààààààààààààà àààà"
 
-#: ../daemon/daemon-main.c:110 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "àààààà: %s"
 
-#: ../daemon/daemon-main.c:155
+#: ../daemon/daemon-main.c:162
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
-msgstr "àààààààà àààà: %s --spawner dbus-id object_path"
+msgstr "ààààààà: %s --spawner dbus-id ààààààà àà (_p)"
 
-#: ../daemon/daemon-main.c:179 ../daemon/daemon-main.c:197
+#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
 #, c-format
 msgid "Usage: %s key=value key=value ..."
-msgstr "Usage: %s key=value key=value ..."
+msgstr "ààààààà: %s àààà=ààà àààà=ààà ..."
 
-#: ../daemon/daemon-main.c:195
+#: ../daemon/daemon-main.c:202
 #, c-format
 msgid "No mount type specified"
-msgstr "àààààà àààààà ààààààà ààà ààààààà ààà ààà"
+msgstr "àààà àààààà ààà ààààààà ààà àààà ààà"
 
-#: ../daemon/daemon-main.c:265
+#: ../daemon/daemon-main.c:272
 #, c-format
 msgid "mountpoint for %s already running"
-msgstr "%s à àààààààààààà àààààààà àààààà"
+msgstr "%s -à àààà àààààààààààà àààààààà ààà ààà"
 
-#: ../daemon/daemon-main.c:276
+#: ../daemon/daemon-main.c:283
 msgid "error starting mount daemon"
-msgstr "àààààà daemon àààà àààààà àààààà ààààà"
+msgstr "àààààà àààà ààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackend.c:933 ../monitor/gdu/ggdumount.c:921
-msgid "Unmount Anyway"
-msgstr "ààààà àà-àààààà ààà à'à"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "EOS àààà àà"
 
-#: ../daemon/gvfsbackend.c:934 ../daemon/gvfsbackendafc.c:388
-#: ../monitor/gdu/ggdudrive.c:1022 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "ààààà"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "àààààààà ààà àààààà àààà àààààààààààà àààààà àààà"
 
-#: ../daemon/gvfsbackend.c:936 ../monitor/gdu/ggdumount.c:923
-msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
-msgstr ""
-"ààààà àààààààà àààààà\n"
-"àà àààà àààààà ààààààààà àààààà ààààà àààààà ààà àààà à"
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "ààà àààà àààààààààààààà àààààà ààà ààààà"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr "AFP ààààààà %s -à ààà àààà àààààààà àààà ààààà"
+
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "AFP ààààààà %s àà àààà àààààà àà"
+
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "àààààààà àà àààààà àààà àààààààààààà àààààà àààà"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "AFP ààààààà %s -à àààààà àààà àààààà àààà"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr "AFP ààààààà %s àà àààààà àààà àààààà àà, àààààà à'à: %d ààààààà àà"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
+msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
+msgstr "AFP ààààààà %s -àà àààà àààààà àà (àààà ààààà àààààààààà àààààà àààà ààà)"
+
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+#| msgid "Failed to get folder list"
+msgid "Failed to connect to server (%s)"
+msgstr "ààààààà (%s) -àà ààààà àààààà àààààà"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter password for afp as %s on %s"
+msgstr "%s -à %s àààà afp -à àààà àààààààà àààààà"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for afp on %s"
+msgstr "%s -à afp -à àààà àààààààà àààààà"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "àààààààà ààààà ààààà ààà àààà"
 
 #: ../daemon/gvfsbackendafc.c:212
 msgid "Internal Apple File Control error"
 msgstr "àààààààààà Apple ààààààà ààààààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:729
+#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
-msgstr "ààààààà ààààààààà"
+msgstr "ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:219
-#| msgid "Directory not empty"
+#: ../daemon/gvfsbackendafc.c:220
 msgid "The directory is not empty"
 msgstr "ààààààààà àààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:223
-#| msgid "The file is not a directory"
+#: ../daemon/gvfsbackendafc.c:224
 msgid "The device did not respond"
 msgstr "àààààààààà ààààààààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:227
-#| msgid "The specified location is not supported"
+#: ../daemon/gvfsbackendafc.c:228
 msgid "The connection was interrupted"
 msgstr "ààààààà àààààààààà ààààà"
 
-#: ../daemon/gvfsbackendafc.c:231
-#| msgid "Invalid reply received"
+#: ../daemon/gvfsbackendafc.c:232
 msgid "Invalid Apple File Control data received"
 msgstr "àààà Apple ààààààà ààààààààà àààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:235
+#: ../daemon/gvfsbackendafc.c:236
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "ààààààààààà Apple ààààààà ààààààààà àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:254
-#, c-format
-msgid "Unhandled Inst proxy error (%d)"
-msgstr "ààààààààààà àààààà ààààààà àààààà (%d)"
+#: ../daemon/gvfsbackendafc.c:252
+msgid "Listing applications installed on device failed"
+msgstr "ààààààà àààààà ààà ààààààààààààà ààààààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:273
-#, c-format
-msgid "Unhandled SBServices proxy error (%d)"
-msgstr "ààààààààààà SBServices ààààààà àààààà (%d) "
+#: ../daemon/gvfsbackendafc.c:268
+msgid "Accessing application icons on device failed"
+msgstr "ààààààà ààààààààà àààààààà ààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:290
+#: ../daemon/gvfsbackendafc.c:285
 msgid "Lockdown Error: Invalid Argument"
 msgstr "àààààà àààààà: àààà àààà"
 
 #
-#: ../daemon/gvfsbackendafc.c:294 ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
 #: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
 msgid "Permission denied"
-msgstr "àààààà àààààà ààà ààà"
+msgstr "àààààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:297
+#: ../daemon/gvfsbackendafc.c:293
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "ààààààààààà àààààà àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:310
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice àààààà: àààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:314
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -346,43 +395,48 @@ msgstr ""
 "libimobiledevice àààààà: àààà àààààà àààà àààà ààààààà ààà usbmuxd àààààààà "
 "àààààààà ààààà"
 
-#: ../daemon/gvfsbackendafc.c:321
+#: ../daemon/gvfsbackendafc.c:318
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "ààààààààààà libimobiledevice àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:388
+#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "ààààà"
+
+#: ../daemon/gvfsbackendafc.c:385
 msgid "Try again"
 msgstr "àààà àààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendarchive.c:536
-#: ../daemon/gvfsbackendarchive.c:565 ../daemon/gvfsbackenddav.c:1631
-#: ../daemon/gvfsbackendhttp.c:315 ../daemon/gvfsbackendobexftp.c:863
-#: ../daemon/gvfsbackendobexftp.c:879 ../daemon/gvfsbackendobexftp.c:898
-#: ../daemon/gvfsbackendsmb.c:655
+#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
+#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
+#: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "àààààà àààààà àààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackendafc.c:443
+#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
-msgstr "àààà AFC ààààààà: ààà ààààà afc://uuid:port-number ààààà ààà"
+msgstr "àààà AFC ààààààà:  afc://uuid:port-number ààààà ààààà ààààà"
 
-#: ../daemon/gvfsbackendafc.c:428
+#: ../daemon/gvfsbackendafc.c:425
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple àààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:433
+#: ../daemon/gvfsbackendafc.c:430
 #, c-format
-msgid "Service %d on Apple Mobile Device"
-msgstr "Apple àààààà ààààààà %d àààà"
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Apple àààààà àààààà, Jailbroken"
 
-#: ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:435
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple àààààà ààààààà àààààààààààà"
 
-#: ../daemon/gvfsbackendafc.c:497
+#: ../daemon/gvfsbackendafc.c:493
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (ààààààààà)"
@@ -390,80 +444,353 @@ msgstr "%s (ààààààààà)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:504 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
 #, c-format
-#| msgid "cdda mount on %s"
 msgid "Documents on %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:583
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
 "Device '%s' is password protected. Enter the password on the device and "
 "click 'Try again'."
 msgstr ""
-"'%s' àààààà ààààààààà ààààààààà ààààààà ààààààààààà àààààà ààà ààààà ààà 'àààà "
-"àààààà ààà'à"
+"'%s' àààààà àààààààà ààààààààà ààààààà àààààààààà àààààà ààà ààààà ààà 'àààà àààààà "
+"ààà'à"
 
 #
-#: ../daemon/gvfsbackendafc.c:922 ../daemon/gvfsbackendarchive.c:632
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1886
-#: ../daemon/gvfsbackendobexftp.c:1073 ../daemon/gvfsbackendsmb.c:709
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
-msgstr "ààààààà àààà ààààà ààà"
-
-#: ../daemon/gvfsbackendafc.c:932 ../daemon/gvfsbackendarchive.c:624
-#: ../daemon/gvfsbackendarchive.c:668 ../daemon/gvfsbackendarchive.c:720
-#: ../daemon/gvfsbackendarchive.c:749 ../daemon/gvfsbackendcdda.c:986
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:1060 ../daemon/gvfsbackendnetwork.c:602
+msgstr "ààààààààà ààààà àààààà"
+
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../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
 #, c-format
 msgid "File doesn't exist"
-msgstr "ààààààà ààààààààà"
+msgstr "ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:1123 ../daemon/gvfsbackendafc.c:2458
-#| msgid "backups not supported yet"
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
-msgstr "ààà àààà àààà àààààà àààààààààà"
+msgstr "ààà ààà àààà àààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:1295
-#| msgid "invalid type"
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
-msgstr "àààà ààààààà ààà"
+msgstr "àààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:2295 ../daemon/gvfsbackendftp.c:1080
-#: ../daemon/gvfsbackendftp.c:1128 ../daemon/gvfsbackendftp.c:1149
-#: ../daemon/gvfsbackendsftp.c:1832 ../daemon/gvfsbackendsftp.c:4637
-#: ../daemon/gvfsbackendsmb.c:1709 ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
+#: ../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:392
 msgid "Operation unsupported"
-msgstr "àà àààààà àààààààà"
+msgstr "ààààààà àààààààà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "àààààààà ààà àààààà à'à: %d ààààààà àà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "àà ààààààààà àààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+#| msgid "sftp for %s on %s"
+msgid "AFP shares for %s on %s"
+msgstr "%s -à %s -à àààà AFP àààààààààààà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+#| msgid "Windows shares on %s"
+msgid "AFP shares on %s"
+msgstr "%s -à AFP àààààààààààà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "àààà àààààààà ààààààà ààà àààà ààà"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Apple àààààà ààààààà àààà"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+#| msgid "File is directory"
+msgid "File is a directory"
+msgstr "ààààààààà ààà ààààààààà"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "ààà àààà ààààààà àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "ààààà àààààààà ààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+#| msgid "Target file exists"
+msgid "Target file is open"
+msgstr "ààààààà ààààààà àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../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/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+#| msgid "File doesn't exist"
+msgid "Ancestor directory doesn't exist"
+msgstr "àààààà ààààààààà ààààààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "àààà àààà-àààà ààà"
+
+#
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "ààààààààà àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "ààààààà ààààààà DeleteInhibit àààààà ààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+#| msgid "File doesn't exist"
+msgid "Target object doesn't exist"
+msgstr "àààààà àààààààà àààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "ID àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1452
+#| msgid "Can't move directory over directory"
+msgid "Can't move directory into one of it's descendants"
+msgstr "àààààààààà àààà àààààà ààà ààààààààààà àààààààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:1456
+#| msgid "Can't move directory over directory"
+msgid "Can't move sharepoint into a shared directory"
+msgstr "àààààààààà ààà àààààààà àààààààààà àààààààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:1460
+#| msgid "Can't move directory over directory"
+msgid "Can't move a shared directory into the Trash"
+msgstr "ààà àààààààà àààààààààà ààààààààà àààààààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "àààààààààà àààà àààà àààààààà RenameInhibit àààààà ààààààà ààà àààà"
+
+#: ../daemon/gvfsbackendafp.c:1472
+#| msgid "File doesn't exist"
+msgid "Object being moved doesn't exist"
+msgstr "àààààààààà àààà àààà ààààààà ààààààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "àààààààà FPCopyFile ààààààà àààààà àààà"
+
+#: ../daemon/gvfsbackendafp.c:1585
+#| msgid "Couldn't get stream file descriptor"
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "ààà àààààààà ààà àà/àààà àààà ààà àààààà ààààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "ààà ààààààà ààà/àààà ààààààà àààààààààà àààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:1601
+#| msgid "The file is not a directory"
+msgid "Source file is a directory"
+msgstr "ààà ààààààà ààà ààààààààà"
+
+#
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "ààààààààà-à ààààààààà ààà ààà ààààà"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../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 "ààààààààà ààààààààà ààà"
+
+#
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "ààààààà ààààààààà ààà ààà ààààà"
+
+#
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "ààààààààà-à ààààààààà àààààààààà ààà ààààà"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+#| msgid "Can't eject file"
+msgid "Can't rename volume"
+msgstr "àààà àààà ààààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:2218
+#| msgid "Name already exists"
+msgid "Object with that name already exists"
+msgstr "ààà àààà ààà ààààààà àààààààà ààààààààààà"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "àààààà àààààààà RenameInhibit àààààà ààààààà ààà àààà"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "àààà àààà ààà ààààààààààààà àààààà àààà"
+
+#: ../daemon/gvfsbackendafp.c:2362
+#| msgid "Target file already exists"
+msgid "Target directory already exists"
+msgstr "àààààà ààààààààà àààààààà ààààààààààà"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "ààààààà ààààà ààà àààààà àààà àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "ààààààà àààà ààà àààààà àààà àààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "ààààààà àà àààà ààààààààààà"
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+#| msgid "Unable to create temporary file"
+msgid "Couldn't create temporary file (%s)"
+msgstr "ààààààà ààààààà (%s) àààààà àààà àààààà"
+
+#
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "ààààààààà ààààààààààà àààààààà ààà ààààà"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "àààààà àààà àààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:3539
+#| msgid "File doesn't exist"
+msgid "Directory doesn't exist"
+msgstr "àààààààààà àààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:3543
+#| msgid "Target %s is not a directory\n"
+msgid "Target object is not a directory"
+msgstr "àààààà ààààààà ààà ààààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "àààà àààààààààà ààà (uint32 ààà ààà ààààà)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+#| msgid "Not supported"
+msgid "Command not supported"
+msgstr "àààààà ààààààà ààà"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "àààààààààààà ààààààààà ààààà ààààà"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "àààààààààààà àààààààà àààà àààà ààààààà"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FPGetUserInfo àààààà àà (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+#| msgid "sftp for %s on %s"
+msgid "AFP volume %s for %s on %s"
+msgstr "%s -à %s -à àààà AFP àààà %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+#| msgid "Documents on %s"
+msgid "AFP volume %s on %s"
+msgstr "%s -à %s -à àààà AFP àààà"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "%s -à AFP àààà %s àààààà àààà àààààà"
+
+#: ../daemon/gvfsbackendafp.c:4303
+#| msgid "No drive specified"
+msgid "No volume specified"
+msgstr "àààà àààà ààààààà ààà àààà ààà"
 
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
-#. Translators: This is the name of the root of an sftp share, like "/ on <hostname>"
-#: ../daemon/gvfsbackendarchive.c:323 ../daemon/gvfsbackendsftp.c:2269
+#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
+#: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
-msgstr "/ %s à ààà"
-
-#: ../daemon/gvfsbackendarchive.c:525 ../daemon/gvfsbackendftp.c:660
-#: ../daemon/gvfsbackendsftp.c:1745
-msgid "No hostname specified"
-msgstr "àààà ààààà à ààà àààààà ààà ààà"
+msgstr "/ %s -àà"
 
-#: ../daemon/gvfsbackendarchive.c:758 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:439
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
 #: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
-#: ../daemon/gvfsbackendsftp.c:3883 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
-msgstr "àà ààààààààà àààà ààààààà ààà"
+msgstr "àà ààààààààà ààà ààààààààà ààà"
 
 #. Translators: This is the name of the backend
 #: ../daemon/gvfsbackendburn.c:346
@@ -472,380 +799,356 @@ msgstr "ààààà ààà"
 
 #: ../daemon/gvfsbackendburn.c:376
 msgid "Unable to create temporary directory"
-msgstr "ààààààà ààààààà àààààààà àààààà ààààà"
+msgstr "ààààààà ààààààààà àààààà àààààà ààààà"
 
 #: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:786
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2207
-#: ../daemon/gvfsbackendgphoto2.c:2926 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
+#: ../daemon/gvfsbackendgphoto2.c:2852 ../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:425 ../daemon/gvfsbackenddav.c:2223
-#: ../daemon/gvfsbackendsftp.c:1828
-msgid "Directory not empty"
-msgstr "ààààààà àààà ààà"
+msgstr "ààà àààà ààààààà àà ààààààààà ààà"
 
 #: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1812
+#: ../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:651
 msgid "CD/DVD Creator"
-msgstr "CD/DVD ààààààà àààààààà"
+msgstr "CD/DVD ààààààààààà"
 
 #
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:3000
+#: ../daemon/gvfsbackendgphoto2.c:2926
 msgid "File exists"
-msgstr "ààààààà ààààààà ààà"
+msgstr "ààààààà ààààààààààà"
 
 #: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:169
-#: ../daemon/gvfsjobcreatemonitor.c:140 ../daemon/gvfsjobcreatemonitor.c:151
-#: ../daemon/gvfsjobcreatemonitor.c:174 ../daemon/gvfsjobcreatemonitor.c:192
-#: ../daemon/gvfsjobdelete.c:122 ../daemon/gvfsjobenumerate.c:256
-#: ../daemon/gvfsjobmakedirectory.c:122 ../daemon/gvfsjobmount.c:109
-#: ../daemon/gvfsjobmountmountable.c:156 ../daemon/gvfsjobmove.c:168
-#: ../daemon/gvfsjobopenforread.c:133 ../daemon/gvfsjobopenforwrite.c:151
-#: ../daemon/gvfsjobopenforwrite.c:165 ../daemon/gvfsjobopenforwrite.c:179
-#: ../daemon/gvfsjobopeniconforread.c:120 ../daemon/gvfsjobpollmountable.c:125
-#: ../daemon/gvfsjobpull.c:175 ../daemon/gvfsjobpush.c:175
-#: ../daemon/gvfsjobqueryattributes.c:135 ../daemon/gvfsjobqueryfsinfo.c:131
-#: ../daemon/gvfsjobqueryinfo.c:149 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141 ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175 ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123 ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123 ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157 ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134 ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166 ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117 ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176 ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136 ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150 ../daemon/gvfsjobqueryinforead.c:119
 #: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
 #: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:150 ../daemon/gvfsjobsetdisplayname.c:127
-#: ../daemon/gvfsjobstartmountable.c:132 ../daemon/gvfsjobstopmountable.c:135
-#: ../daemon/gvfsjobtrash.c:122 ../daemon/gvfsjobunmountmountable.c:139
-#: ../daemon/gvfsjobunmountmountable.c:154 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
-#: ../monitor/gdu/ggduvolume.c:1595
+#: ../daemon/gvfsjobsetattribute.c:151 ../daemon/gvfsjobsetdisplayname.c:128
+#: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
+#: ../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
 msgid "Operation not supported by backend"
-msgstr "àà àààààà ààà àààà àààààà ààààààà ààà"
+msgstr "ààààààà ààààààà àààààà ààààààà ààà"
 
 #: ../daemon/gvfsbackendburn.c:853
 msgid "No such file or directory in target path"
-msgstr "àààààà àààà àà àààà ààààààà àà ààààààà ààààààà ààà"
+msgstr "àààààà ààà ààà àààà ààààààà àà ààààààààà ààààààà ààà"
 
 #
-#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendftp.c:1535
-#: ../daemon/gvfsbackendobexftp.c:1781
-msgid "Can't copy directory over directory"
-msgstr "àààààààà ààà ààààààà ààà ààà ààààà"
-
-#
-#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1789
-#: ../daemon/gvfsbackendobexftp.c:1820 ../daemon/gvfsbackendsftp.c:1830
-#: ../daemon/gvfsbackendsftp.c:4445
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
-msgstr "àààààà ààààààà ààààààà ààà"
-
-#
-#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendftp.c:1558
-#: ../daemon/gvfsbackendobexftp.c:1796
-msgid "Can't recursively copy directory"
-msgstr "ààààààààà àààà ààààààà ààà ààà àààà àà"
+msgstr "àààààà ààààààà ààààààààààà"
 
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2580 ../daemon/gvfsbackendgphoto2.c:2789
-#: ../daemon/gvfsbackendgphoto2.c:2886 ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
+#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
 msgid "Not supported"
 msgstr "ààààààà ààà"
 
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "àààààà àààààààà ààà"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"àààà àààààààà àààààà\n"
+"ààà àààà àààà ààààààààà àààààà àààà àààààà ààà ààààà"
+
 #: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
 msgid "Cannot create gudev client"
-msgstr "gudev ààààà ààààààà àààààà àààààà"
+msgstr "gudev àààààààà àààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
 msgid "Cannot connect to the system bus"
-msgstr "ààààààà àààà àààà ààààà ààààààà àààààà"
+msgstr "ààààààà àààà àààà ààààà àààà àààààà"
 
 #: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
 msgid "Cannot create libhal context"
-msgstr "libhal àààààààà ààààààà àààààà àààààà"
+msgstr "libhal ààààààààààààà àààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
 msgid "Cannot initialize libhal"
-msgstr "libhal ààààà àààààà àààààà"
+msgstr "libhal ààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
-msgstr "àààà àààààà ààààààà ààà ààà"
+msgstr "àààà àààààà ààààààà ààà àààà ààà"
 
 #: ../daemon/gvfsbackendcdda.c:417
 #, c-format
 msgid "Cannot find drive %s"
-msgstr "àààààà ààààà ààà ààààà: %s"
+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
-#: ../daemon/gvfsbackendcdda.c:439
+#. 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:440 ../daemon/gvfsbackendcdda.c:960
-#: ../monitor/gdu/ggduvolume.c:337 ../monitor/hal/ghalmount.c:325
+#: ../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
 #, c-format
 msgid "Audio Disc"
-msgstr "àààà ààààà"
+msgstr "àààà' ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
-msgstr[0] "ààààààà ààààààà àààààà: %d-àà ààààààà àààà"
-msgstr[1] "ààààààà ààààààà àààààà: %d-àà ààààààà àààà"
+msgstr[0] "ààààààà ààààààà àààààà: %d àààà ààààààà"
+msgstr[1] "ààààààà ààààààà àààààà: %d àààà ààààààààààà"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "%s àààà àààà ààààààà, %s àààààààà ààààààà ààà"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
-msgstr "àààààà %s à 'paranoia'à ààà àààààà àààààà"
+msgstr "àààààà %s -à  'paranoia -à ààà àààààà àààààà"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
-msgstr "àààààà %s à ààààààà àààààà àààààà"
+msgstr "àààààà %s à ààààààà àààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendcdda.c:979 ../daemon/gvfsbackendgphoto2.c:1894
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
 #, c-format
 msgid "No such file"
-msgstr "àà àààà ààààààà ààààààààà"
+msgstr "ààà àààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
-msgstr "àà àààà ààààààààà àà ààààààààà àààà àààà ààààààà ààà"
+msgstr "àà àààà ààààààààà àà ààà àààà àààà' ààààààà ààà"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
-msgstr "àààà CD ààààààà-ààààààà ààààààà"
+msgstr "àààà' CD àààààààààààààà àààà"
 
 #: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
-msgstr "Computer"
+msgstr "àààààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:521
-#| msgid "Filesystem"
 msgid "File System"
 msgstr "ààààààà ààààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:649
 msgid "Can't open mountable file"
-msgstr "ààààààààààà ààààààà àààà ààààà ààà"
+msgstr "ààààààààààà ààààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:840 ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
-msgstr "àààààààààà àààààà: %s"
+msgstr "àààààààààà àààààà: %s"
 
 #: ../daemon/gvfsbackendcomputer.c:872 ../daemon/gvfsbackendcomputer.c:991
 msgid "Can't mount file"
-msgstr "ààààààà àààààà ààà ààààà ààà"
+msgstr "ààààààà àààààà àààà àààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
-msgstr "ààààààà àààà àààààà ààà"
+msgid "No medium in the drive"
+msgstr "ààààààà àààà àààààà ààà"
 
 #: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
 #: ../daemon/gvfsbackendcomputer.c:1142 ../daemon/gvfsbackendcomputer.c:1232
 #: ../daemon/gvfsbackendcomputer.c:1305 ../daemon/gvfsbackendcomputer.c:1374
 msgid "Not a mountable file"
-msgstr "ààààààààà ààààààààààà ààà"
+msgstr "ààààààààà ààààààààààà ààà"
 
 #: ../daemon/gvfsbackendcomputer.c:1055
 msgid "Can't unmount file"
-msgstr "ààààààààà àà-àààààà ààà ààààà ààà"
+msgstr "ààààààààà àààààààà àààà àààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:1185
 msgid "Can't eject file"
-msgstr "ààààààààà ààà ààà ààààà ààà"
+msgstr "ààààààààà ààààà àààà àààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:1252 ../daemon/gvfsbackendcomputer.c:1259
 msgid "Can't start file"
-msgstr "ààààààà ààààà àààààà àààààà"
+msgstr "ààààààà ààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:1325 ../daemon/gvfsbackendcomputer.c:1332
 msgid "Can't stop file"
-msgstr "ààààààà àààà àààààà àààààà"
+msgstr "ààààààà àààà ààà ààààà"
 
 #: ../daemon/gvfsbackendcomputer.c:1389 ../daemon/gvfsbackendcomputer.c:1396
 msgid "Can't poll file"
-msgstr "ààààààà poll àààààà àààààà"
+msgstr "ààààààà poll ààà ààààà"
+
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+msgid "WebDAV as %s on %s%s"
+msgstr "WebDAV àààà %s%s -à %s"
 
-#: ../daemon/gvfsbackenddav.c:561 ../daemon/gvfsbackenddav.c:1698
-#: ../daemon/gvfsbackendhttp.c:261
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
+#. %s and it is only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:493
+#, c-format
+msgid "WebDAV on %s%s"
+msgstr "%s%s -à WebDAV"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:248
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP àààààà: %s"
 
-#: ../daemon/gvfsbackenddav.c:578
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
-msgstr "ààààààà ààààà àààààààà ààà ààààà"
+msgstr "ààààààààààà àààààààà ààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:587
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
-msgstr "ààààààà ààààà ààààà"
+msgstr "ààààààààààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:595
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
-msgstr "ààààà ààà ààààààà ààààà àààààààààà àà"
+msgstr "àààààààà ààà ààààààààààà ààààà"
 
-#: ../daemon/gvfsbackenddav.c:1214 ../daemon/gvfsbackenddav.c:1838
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
-msgstr "ààààààà ààààà ààà ààà"
+msgstr "àààà ààààààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1357
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
-msgstr "WebDAV ààààà"
+msgstr "WebDAV àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
-msgstr "%s à àààà ààààààààà àààà"
+msgstr "%s à àààà àààààààà àààààà"
 
-#: ../daemon/gvfsbackenddav.c:1362
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
-msgstr "ààààààà à àààà ààààààààà àààà"
+msgstr "ààààààà ààà ààààààà àààààààà àààààà"
 
-#: ../daemon/gvfsbackenddav.c:1702 ../daemon/gvfsbackenddav.c:1706
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
-msgstr "WebDAV ààààààà ààààà ààà"
-
-#: ../daemon/gvfsbackenddav.c:1734
-#, c-format
-msgid "WebDAV on %s"
-msgstr "%s à ààà WebDAV"
+msgstr "WebDAV ààààààààà àààààààà ààà"
 
-#: ../daemon/gvfsbackenddav.c:1794 ../daemon/gvfsbackenddav.c:1867
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
-msgstr "àààààà àààààà ààà ààààà ààà"
-
-#: ../daemon/gvfsbackenddav.c:1930 ../daemon/gvfsbackenddav.c:2183
-#: ../daemon/gvfsbackenddav.c:2294 ../daemon/gvfsbackendftp.c:745
-#: ../daemon/gvfsbackendftp.c:926 ../daemon/gvfsbackendftp.c:1365
-#: ../daemon/gvfsbackendftp.c:1543 ../daemon/gvfsbackendsftp.c:4289
-#: ../daemon/gvfsbackendsmb.c:2054
-msgid "Target file already exists"
-msgstr "àààààààà ààààààà àààààààà ààààààà"
-
-#
-#: ../daemon/gvfsbackenddav.c:2003 ../daemon/gvfsbackendsftp.c:3423
-#: ../daemon/gvfsbackendsmb.c:1139
-msgid "The file was externally modified"
-msgstr "ààààààààà ààààààààààààà àààààààà ààà àààà"
+msgstr "àààààà àààààà àààà àààààà"
 
 #
-#: ../daemon/gvfsbackenddav.c:2034 ../daemon/gvfsbackendsmb.c:1175
-#: ../daemon/gvfsbackendsmb.c:2071
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
-msgstr "ààà-àà ààààààà ààààààà àààààà àààààà"
+msgstr "ààààà ààààààà àààààà ààà ààààà"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:486 ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
-msgstr "ààààààà ààààààà"
+msgstr "ààààààà àààààààà"
 
-#: ../daemon/gvfsbackenddnssd.c:730 ../daemon/gvfsbackendnetwork.c:753
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
-msgstr "ààààààà àà ààààààà àààààààà ààà ààààà ààà"
+msgstr "ààààààà àà ààààààààà àààààààà àààà àààààà"
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:748
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
 #
-#: ../daemon/gvfsbackenddnssd.c:749 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
 #: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
-msgstr "ààààààà"
+msgstr "àààààààà"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:481
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "%s àààà %s à ààà ftp à àààà ààààààààà àààà"
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "%s -à %s  àààààà FTP à àààà àààààààà àààààà"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:484
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "%s à ààà ftp à àààà ààààààààà àààà"
-
-#: ../daemon/gvfsbackendftp.c:511 ../daemon/gvfsbackendsftp.c:985
-#: ../daemon/gvfsbackendsmb.c:613 ../daemon/gvfsbackendsmbbrowse.c:995
-msgid "Password dialog cancelled"
-msgstr "ààààààààà ààààà àààà ààà àààà"
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for FTP on %s"
+msgstr "%s -à  FTP  -à àààà àààààààà àààààà"
 
-#: ../daemon/gvfsbackendftp.c:623
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "%s à ààà ftp"
+#| msgid "/ on %s"
+msgid "FTP on %s"
+msgstr "%s -à FTP"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:627
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "ftp as %s on %s"
+#| msgid "ftp as %s on %s"
+msgid "FTP as %s on %s"
+msgstr "%s -à  %s àààààà FTP"
 
-#: ../daemon/gvfsbackendftp.c:720
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
 msgstr "ààààààààà àààààà"
 
-#: ../daemon/gvfsbackendftp.c:766 ../daemon/gvfsbackendsftp.c:2333
-#: ../daemon/gvfsbackendsftp.c:3069 ../daemon/gvfsbackendsftp.c:3410
-#: ../daemon/gvfsbackendsftp.c:4280
-msgid "File is directory"
-msgstr "ààààààà ààààààààà ààààààà"
-
-#: ../daemon/gvfsbackendftp.c:974 ../daemon/gvfsbackendftp.c:1328
-#: ../daemon/gvfsbackendsftp.c:3276
-msgid "backups not supported yet"
-msgstr "ààà àààà àààà àààààà ààààààààà"
-
-#: ../daemon/gvfsbackendftp.c:1121 ../daemon/gvfsbackendsftp.c:4647
-#| msgid "Invalid attribute type %s\n"
-msgid "Invalid attribute type (uint32 expected)"
-msgstr "àààà àààààààààà ààà (uint32 ààà ààà ààààà)"
-
 #: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
-msgstr "%s: %d: ààààààà àààà ààààààà ààààààà ààà"
+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
 msgid "%s: %d: Invalid filename"
-msgstr "%s: %d: àààààààà ààà ààà ààà"
+msgstr "%s: %d: àààà àààààààààà "
 
 #: ../daemon/gvfsbackendgphoto2.c:525
 #, c-format
@@ -856,7 +1159,7 @@ msgstr "%s: %d: ààààààà ààà"
 #: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
 #, c-format
 msgid "Digital Camera (%s)"
-msgstr "ààààààà ààààààà (%s)"
+msgstr "ààààààà àààààà (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
@@ -864,7 +1167,7 @@ msgstr "ààààààà ààààààà (%s)"
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
-msgstr "%s ààààààà"
+msgstr "%s àààààà"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
@@ -872,190 +1175,192 @@ msgstr "%s ààààààà"
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "%s àààà ààààààà"
+msgstr "%s àààà' ààààààà"
 
 #
 #: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
-msgstr "ààààààà"
+msgstr "àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
-msgstr "àààà ààààààà"
+msgstr "àààà' ààààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1569
 msgid "No device specified"
-msgstr "àààà àààààà ààààààà ààà ààà"
+msgstr "àààà àààààà ààààààà ààà àààà ààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1590
 msgid "Cannot create gphoto2 context"
-msgstr "gphoto2 àààààààà ààààààà àààààà àààààà"
+msgstr "gphoto2 ààààààààààààà àààààà ààà ààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1600
 msgid "Error creating camera"
-msgstr "ààààààà àààààà àààààà àààààà"
+msgstr "àààààà àààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
 msgid "Error loading device information"
-msgstr "àààààà ààààààààà àààà ààà àààààà àààààà"
+msgstr "àààààà àààà ààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1635
 msgid "Error looking up device information"
-msgstr "àààààà ààààààààà àààà ààààààààà àààààà àààààà"
+msgstr "àààààà àààà ààààààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1645
 msgid "Error getting device information"
-msgstr "àààààà ààààààààà àààààà ààààààà àààààà àààààà"
+msgstr "àààààà àààà ààààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1658
 msgid "Error setting up camera communications port"
-msgstr "àààààààà àààà àààààààààà ààààà àààààààà àààààà àààààà"
+msgstr "ààààààà àààà ààààà ààààà ààààà ààààà àààààà"
 
 #: ../daemon/gvfsbackendgphoto2.c:1669
 msgid "Error initializing camera"
-msgstr "ààààààà ààààà àààààà àààààà"
+msgstr "àààààà ààààà ààààà àààààà"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1683
+#. 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:1684
 #, c-format
 msgid "gphoto2 mount on %s"
-msgstr "%s-àà gphoto2 àààààà ààà àààà"
+msgstr "%s -à gphoto2 àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1765
+#: ../daemon/gvfsbackendgphoto2.c:1766
 msgid "No camera specified"
-msgstr "àààà ààààààà àààààà ààà ààà"
-
-#: ../daemon/gvfsbackendgphoto2.c:1806 ../daemon/gvfsbackendgphoto2.c:1832
-#, c-format
-msgid "Filesystem is busy"
-msgstr "ààààààà-ààààààà àààààààà àààààà"
+msgstr "àààà àààààà ààààààà ààà àààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1902
+#: ../daemon/gvfsbackendgphoto2.c:1828
 msgid "Error creating file object"
-msgstr "ààààààà ààààààà àààààà àààààà àààààà"
+msgstr "ààààààà ààààààà àààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1917
+#: ../daemon/gvfsbackendgphoto2.c:1843
 msgid "Error getting file"
-msgstr "ààààààà ààààààà àààààà àààààà"
+msgstr "ààààààà ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1927
+#: ../daemon/gvfsbackendgphoto2.c:1853
 msgid "Error getting data from file"
-msgstr "àààààààà ààà àààà ààààààà àààààà àààààà"
+msgstr "àààààààà ààà àààà ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
+#: ../daemon/gvfsbackendgphoto2.c:1911
 #, c-format
 msgid "Malformed icon identifier '%s'"
-msgstr "àààà àààààààà '%s' ààààààààààà"
+msgstr "ààààààààààà àààà àààààààà '%s'"
 
-#: ../daemon/gvfsbackendgphoto2.c:2061 ../daemon/gvfsbackendgphoto2.c:3250
+#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
 #, c-format
 msgid "Error seeking in stream on camera %s"
-msgstr "ààààààà %s-à ààààààà seek àààààà àààààà"
+msgstr "àààààà %s-à ààààààà àààààà  ààààà àààààà"
 
 #
-#: ../daemon/gvfsbackendgphoto2.c:2201 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
-msgstr "ààààààà ààà"
+msgstr "ààà ààààààààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2234
+#: ../daemon/gvfsbackendgphoto2.c:2160
 msgid "Failed to get folder list"
-msgstr "ààààààà àààààà ààààààà àààààà àààààà"
+msgstr "ààààààà àààààà ààààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2300
+#: ../daemon/gvfsbackendgphoto2.c:2226
 msgid "Failed to get file list"
-msgstr "àààààààà àààààà ààààààà àààààà àààààà"
+msgstr "àààààààà àààààà ààààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2592
+#: ../daemon/gvfsbackendgphoto2.c:2518
 msgid "Error creating directory"
-msgstr "ààààààà ààààààà àààààà àààààà"
+msgstr "ààààààààà àààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2801
+#: ../daemon/gvfsbackendgphoto2.c:2727
 msgid "Name already exists"
-msgstr "àààààààà ààà àààààààà ààààààà"
+msgstr "àààààààà ààà àààààààà ààààààààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:3441
+#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
 msgid "New name too long"
-msgstr "àààà ààà àààààààà ààààà"
+msgstr "àààà ààà àààààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2822 ../daemon/gvfsbackendgphoto2.c:3452
-msgid "Error renaming dir"
-msgstr "àààààààà ààà àààààààà àààààà àààààà"
+#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
+#| msgid "Error creating directory"
+msgid "Error renaming directory"
+msgstr "ààààààààà àààà ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2835 ../daemon/gvfsbackendgphoto2.c:3465
+#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
 msgid "Error renaming file"
-msgstr "àààààààà ààà àààààààà àààààà àààààà"
+msgstr "àààààààà àààà ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2899
+#: ../daemon/gvfsbackendgphoto2.c:2825
 #, c-format
 msgid "Directory '%s' is not empty"
-msgstr "ààààààà '%s' ààààà ààà"
+msgstr "ààààààààà '%s' ààààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2910
+#: ../daemon/gvfsbackendgphoto2.c:2836
 msgid "Error deleting directory"
-msgstr "ààààààà àààààààà àààààà"
+msgstr "ààààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2936
+#: ../daemon/gvfsbackendgphoto2.c:2862
 msgid "Error deleting file"
-msgstr "ààààààà àààààààà àààààà"
+msgstr "ààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2989
+#: ../daemon/gvfsbackendgphoto2.c:2915
 msgid "Can't write to directory"
-msgstr "àààààààà àààà ààààà ààà"
+msgstr "àààààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3036
+#: ../daemon/gvfsbackendgphoto2.c:2962
 msgid "Cannot allocate new file to append to"
-msgstr "àààààà àààà ààààààààà àààà ààààààà àààààà ààà ààààà ààà"
+msgstr "àààààà àààà àààà àààà ààààààà àààààà àààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3051
+#: ../daemon/gvfsbackendgphoto2.c:2977
 msgid "Cannot read file to append to"
-msgstr "àààààà àààà ààààààààà ààààààà ààààààà àààà àààààà"
+msgstr "àààààà àààà àààà ààààààà ààààààà àààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3062
+#: ../daemon/gvfsbackendgphoto2.c:2988
 msgid "Cannot get data of file to append to"
-msgstr "àààààà àààà ààààààààà ààààààà àààààààà àààà ààààààà àààààà àààààà"
+msgstr "àààààà àààà àààà ààààààà àààààààà àààà ààààààà ààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
+#: ../daemon/gvfsbackendgphoto2.c:3275
 msgid "Error writing file"
-msgstr "àààààààà ààààà àààààà"
+msgstr "àààààààà àààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:3323
 msgid "Not supported (not same directory)"
-msgstr "ààààààà ààà (àà ààààààà ààà)"
+msgstr "ààààààà ààà (ààà ààààààààà ààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3409
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Not supported (src is dir, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3335
+#| msgid "Not supported (src is dir, dst is dir)"
+msgid "Not supported (the source is a directory, the destination is a directory too)"
+msgstr "ààààààà ààà (ààà ààà ààààààààà, àààààààà ààà ààààààààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3417
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "ààààààà ààà (src àààà ààààààà, dst àààà ààààààà ààààààà)"
+#: ../daemon/gvfsbackendgphoto2.c:3343
+#| msgid "Not supported (src is dir, dst is existing file)"
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr "ààààààà ààà (ààà ààà ààààààààà, ààààààà ààà ààààààààààà ààààààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3429
-msgid "Not supported (src is file, dst is dir)"
-msgstr "ààààààà ààà (src àààà ààààààà, dst àààà ààààààà)"
+#: ../daemon/gvfsbackendgphoto2.c:3355
+#| msgid "Not supported (src is file, dst is dir)"
+msgid "Not supported (the source is a file, but the destination is a directory)"
+msgstr "ààààààà ààà (ààà ààà ààààààà, àààààà ààààààà ààà ààààààààà)"
 
-#: ../daemon/gvfsbackendhttp.c:257
+#: ../daemon/gvfsbackendhttp.c:244
 #, c-format
 msgid "HTTP Client Error: %s"
-msgstr "HTTP Client àààààà: %s"
+msgstr "HTTP àààààààà àààààà: %s"
 
 #: ../daemon/gvfsbackendlocaltest.c:855
 msgid "Directory notification not supported"
-msgstr "ààààààà ààààààààà ààààààààààà àààààààà àààààààà ààààààà ààà"
+msgstr "ààààààààà àààààà ààààààà ààà"
 
 #
 #. smb:/// root link
 #: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
-msgstr "Windows ààààààà"
+msgstr "Windows àààààààà"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
 #: ../daemon/gvfsbackendnetwork.c:873
 msgid "Network Location Monitor"
-msgstr "Network Location Monitor"
+msgstr "àààààààà ààààààà ààààà"
 
 #. Set the mountspec according to original uri, no matter whether user changes
 #. credentials during mount loop. Nautilus and other gio clients depend
@@ -1063,98 +1368,93 @@ msgstr "Network Location Monitor"
 #. 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:683 ../daemon/gvfsbackendsmb.c:552
-#: ../daemon/gvfsbackendsmb.c:1424
+#: ../daemon/gvfsbackendobexftp.c:681 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
-msgstr "%s, %s à ààà"
+msgstr "%s -à %s"
 
-#: ../daemon/gvfsbackendobexftp.c:892
+#: ../daemon/gvfsbackendobexftp.c:890
 msgid "USB support missing. Please contact your software vendor"
-msgstr ""
-"USB àààààà àààààà ààà à ààààààà ààà àààààà àààààààààà ààààààààà àààà ààààààà ààà"
+msgstr "USB àààààà àààààà àààà ààààààà ààà àààààà ààààààà ààààààààà àààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1012
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
-msgstr "ààààààà àààà ààààà ààààààààà àààà"
+msgstr "ààààààà àààà ààààà ààààààààà àààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1509
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
-msgstr "àààààà àààààà ààààààààààà àààààààààà ààààà ààà àààààà"
+msgstr "ààààààà ààà  ààààààà àààààà ààààààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1857 ../daemon/gvfsbackendsmb.c:1945
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
-msgstr "ààààààà àààààààà àààààà: %s"
+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"
-msgstr "àààà ààààà àààààààààààà ààààà"
+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"
-msgstr "àà-àà àààà àààààààà ààààà àààààààà àààà"
+msgstr "àà-àà àààà ààà àààà àà"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendsftp.c:958
 #, c-format
-#| msgid "Enter password for ftp as %s on %s"
 msgid "Enter passphrase for key for ssh as %s on %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 ftp as %s on %s"
 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"
 msgid "Enter passphrase for key for ssh on %s"
 msgstr "%s -à ààà ssh -à ààààà ààààà passphrase àààààà"
 
 #. Translators: %s is the hostname
 #: ../daemon/gvfsbackendsftp.c:968
 #, c-format
-#| msgid "Enter password for ftp on %s"
 msgid "Enter password for ssh on %s"
-msgstr "%s -à ààà ssh -à ààààà ààààààààà àààààà"
+msgstr "%s -à ààà ssh -à ààààà àààààààà àààààà"
 
 #: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
-msgstr "ààààààààà àààààà ààààà ààà"
+msgstr "àààààààà àààà àààààà"
 
 #: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
-msgstr "ààààà àà-àà ààà à'à"
+msgstr "àààààà àà-àà ààà"
 
 #
 #: ../daemon/gvfsbackendsftp.c:1056
@@ -1170,40 +1470,42 @@ 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
 msgid "Login dialog cancelled"
-msgstr "àà-àà ààààà àààà ààà àààà"
+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>"
+#. 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 ààà"
+#| msgid "sftp for %s on %s"
+msgid "SFTP for %s on %s"
+msgstr "%s -à %s -à àààà SFTP"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
+#. 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"
+#| msgid "/ on %s"
+msgid "SFTP on %s"
+msgstr "%s -à SFTP"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
-msgstr "ààààààà ssh àààààààà ààààà ààà ààààà"
+msgstr "ààààààà ssh àààààààà àààà ààà"
 
 #: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
 #: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
@@ -1212,28 +1514,28 @@ msgstr "ààààààà ssh àààààààà ààààà à
 #: ../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:3248 ../daemon/gvfsbackendsftp.c:3290
-#: ../daemon/gvfsbackendsftp.c:3475 ../daemon/gvfsbackendsftp.c:3507
-#: ../daemon/gvfsbackendsftp.c:3562 ../daemon/gvfsbackendsftp.c:3619
-#: ../daemon/gvfsbackendsftp.c:3916 ../daemon/gvfsbackendsftp.c:3983
-#: ../daemon/gvfsbackendsftp.c:4118 ../daemon/gvfsbackendsftp.c:4178
-#: ../daemon/gvfsbackendsftp.c:4213 ../daemon/gvfsbackendsftp.c:4241
-#: ../daemon/gvfsbackendsftp.c:4349 ../daemon/gvfsbackendsftp.c:4403
-#: ../daemon/gvfsbackendsftp.c:4442 ../daemon/gvfsbackendsftp.c:4476
-#: ../daemon/gvfsbackendsftp.c:4510 ../daemon/gvfsbackendsftp.c:4525
-#: ../daemon/gvfsbackendsftp.c:4540 ../daemon/gvfsbackendsftp.c:4618
+#: ../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 "ààààààà ààààà àààà ààà"
+msgstr "àààà ààààà ààààà ààà àààà"
 
 #
-#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1431
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
-msgstr " (ààààààà àààà ààà)"
+msgstr " (àààà ààààààà)"
 
 #: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
-msgstr "àààààà"
+msgstr "àààààààà"
 
 #: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
@@ -1243,104 +1545,99 @@ msgstr "OpenIconForRead-à àààà icon_id '%s'"
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
-msgstr "ààà-àà ààààààà àààààà àààààà àààààà: %s"
+msgstr "ààààà ààààààà àààààà ààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3352
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
-msgstr "ààààààà ààààààà àààààààà àààààà ààààà"
+msgstr "ààààààà ààààààà àààààà àààààà ààààà"
+
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "%s à àààà ààààààààà ààààààà"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "%s -à  Windows àààààààààààà"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "àààààààà ààà ààààààààà àààààà ààààààà ààà ààààà"
 
 #
-#: ../daemon/gvfsbackendsftp.c:4275 ../daemon/gvfsbackendsmb.c:2043
-msgid "Can't move directory over directory"
-msgstr "àààààààà ààà ààààààà àààààààààà ààà àààà àà"
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "àààààà ààààààà ààà"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Windows ààààààà ààààààà àààà"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:236
+#: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
-msgstr "%s ààààà %s à ààà ààààààà ààà àà àààààààà àààà ààààààààà ààààààà"
+msgstr "%s -à %s ààààààààà  àààà ààààààààà ààààààà"
 
-#: ../daemon/gvfsbackendsmb.c:492 ../daemon/gvfsbackendsmb.c:538
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
-msgstr "àààààààààà àààààà (%s)"
+msgstr "àààààààààà àààààà (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:618
+#: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
-msgstr "Windows ààààà àààààà àààààà ààààà"
+msgstr "Windows àààààààà àààààà ààààà ààààà"
 
-#: ../daemon/gvfsbackendsmb.c:779 ../daemon/gvfsbackendsmb.c:1275
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
-msgstr "seek à ààà ààààààà ààà"
+msgstr "àààààààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendsmb.c:1367
+#: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
-msgstr "ààà-àà ààààààà àààààààà ààà ààààà: %s"
+msgstr "ààààà ààààààà àààààà ààà ààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1724
-#| msgid "Invalid attribute type %s\n"
+#: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
-msgstr "àààà àààààààààà ààà (uint64 ààà ààà ààààà)"
+msgstr "àààà àààààààààà ààà (uint64 ààà ààà ààààà)"
+
+#: ../daemon/gvfsbackendsmb.c:1922
+#| msgid "Target file already exists"
+msgid "Can't rename file, filename already exists"
+msgstr "ààààààà àààà ààààààà àààà àààààà, àààààààààà àààààààà ààààààààààà"
 
-#: ../daemon/gvfsbackendsmb.c:2019
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
-msgstr "ààààààà àààààààààà àààààà àààààà: %s"
+msgstr "ààààààà àààààààààà ààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2091
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
-msgstr "àààààà ààààààà àààààààà àààààà: %s"
+msgstr "àààààà ààààààà ààààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2115
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
-msgstr "ààààààààà àààà àààààààààà àààààààààà ààà ààààà ààà"
+msgstr "ààààààààà àààà ààààààààà àààààààààà àààà àààààà"
 
-#: ../daemon/gvfsbackendsmb.c:2159
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
-msgstr "Windows Shares Filesystem Service"
-
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:375
-#, c-format
-msgid "Password required for %s"
-msgstr "%s à àààà ààààààààà ààààààà"
-
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:902
-#, c-format
-msgid "Windows shares on %s"
-msgstr "%s à Windows ààààààààà"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:1001
-msgid "Failed to retrieve share list from server"
-msgstr "ààààà ààà àààààà àààààà ààààààà àààààà àààààà"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1089 ../daemon/gvfsbackendsmbbrowse.c:1135
-msgid "The file is not a mountable"
-msgstr "àà ààààààààà àààààà ààà ààààà ààà"
-
-#
-#: ../daemon/gvfsbackendsmbbrowse.c:1157
-msgid "Not a regular file"
-msgstr "àààààà ààààààà ààà"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1489
-msgid "Windows Network Filesystem Service"
-msgstr "Windows Network Filesystem Service"
+msgstr "Windows àààààààà ààààààà àààà"
 
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
-msgstr "àààààààà ààààààà àààà àààà ààà ààà àààà"
+msgstr "àààààààà ààààààà ààà àààààà àààà àààà"
 
 #: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 msgid "Items in the trash may not be modified"
-msgstr "àààààààà àààààà ààààààà ààààà àààààààà ààà ààààà àà ààà àààà"
+msgstr "àààààààà ààààà ààààààà ààààà àààààààà ààà ààààà àààà àààà"
 
 #
 #. Translators: this is the display name of the backend
@@ -1351,12 +1648,13 @@ msgstr "ààààààà"
 
 #: ../daemon/gvfsdaemon.c:1056
 msgid "Invalid backend type"
-msgstr "ààààààà ààà àààà àààààà àààààààà"
+msgstr "àààà ààààààà ààà"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "fd ààààààà àààààà: %s"
+#| msgid "Error sending fd: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "ààààààà ààààà àààààà àààààà: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
@@ -1365,27 +1663,25 @@ msgstr "àààààààà ààààààààààà àààà
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
 #: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
 msgid "Invalid reply"
-msgstr "ààààà ààà ààà"
+msgstr "àààà ààààà"
 
 #: ../daemon/gvfsftpconnection.c:392
 msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
-msgstr ""
-"àààààà FTP ààààà ààààà àààààà àààààà à ààààààà àààààà àààààà àààààà àààà ààààààà "
-"à'à'à?"
+msgstr "àààààà FTP ààààà àààààà ààà àààààà ààààààà àààààà ààààààà àààà àààààà àààà?"
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
-msgstr "àààààà FTP ààààà ààààà àààààà àààààà à"
+msgstr "àààààà FTP ààààà àààààà ààà àààààà"
 
 #: ../daemon/gvfsftpfile.c:170
 msgid "Filename contains invalid characters."
-msgstr "àààààààà àààà àààà ààààà ààà à"
+msgstr "àààààààà àààà àààà ààààà àààà"
 
 #: ../daemon/gvfsftptask.c:262
 msgid "The FTP server is busy. Try again later"
-msgstr "FTP àààà àààààààà àààààà à àààà àààààà ààààààààà ààà"
+msgstr "FTP ààààààà àààààààà ààààààà àààà àààà ààààààààà ààà"
 
 #: ../daemon/gvfsftptask.c:356
 msgid "Accounts are unsupported"
@@ -1393,11 +1689,11 @@ msgstr "ààààààà ààààààà ààà"
 
 #: ../daemon/gvfsftptask.c:360
 msgid "Host closed connection"
-msgstr "ààààà ààààà àààà ààààà"
+msgstr "àààààà ààààà àààà ààààà"
 
 #: ../daemon/gvfsftptask.c:364
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr "àààà ààààà àààààà ààààà ààà à ààààààà ààààààà àààààà àààà àààààààà ààà àààà?"
+msgstr "àààà ààààà ààààà ààààààà ààààààà ààààààà àààààà àààà àààààààà ààà àààà?"
 
 #: ../daemon/gvfsftptask.c:368
 msgid "Data connection closed"
@@ -1405,126 +1701,132 @@ msgstr "àààà ààààà àààà ààà àààà"
 
 #: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
 msgid "Operation failed"
-msgstr "àààà àààà"
+msgstr "ààààààà àààààà"
 
 #: ../daemon/gvfsftptask.c:384
 msgid "No space left on server"
-msgstr "ààààà àààà ààààààà ààààà ààà"
+msgstr "àààààààà àààà ààààààà ààààà ààà"
 
 #: ../daemon/gvfsftptask.c:396
 msgid "Unsupported network protocol"
-msgstr "ààààààà àààààààà ààààààà ààà"
+msgstr "àààààààà àààààààà àààààààà "
 
 #: ../daemon/gvfsftptask.c:404
 msgid "Page type unknown"
-msgstr "ààààà ààà àààààà"
+msgstr "àààààà ààà ààà"
 
 #
 #: ../daemon/gvfsftptask.c:408
 msgid "Invalid filename"
 msgstr "àààà àààààààà ààà"
 
-#: ../daemon/gvfsjobmakesymlink.c:126
+#: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
-msgstr "ààà àààà symlink àààààà ààà àà"
+msgstr "ààààààà àààààà Symlinks ààààààà ààà"
 
 #: ../daemon/gvfsjobsetattribute.c:120
 msgid "Invalid dbus message"
-msgstr "dbus ààààà àààà ààà"
+msgstr "àààà dbus àààààà"
+
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "àààààààààààààà  àààààà"
 
 #: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
-msgstr "àààààà daemon à àààààààà ààà"
+msgstr "ààààà daemon à àààààààà ààà"
 
 #: ../daemon/main.c:46
 msgid "Don't start fuse."
-msgstr "fuse àààà ààà à'à'à à"
+msgstr "fuse ààààà àààààà"
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:62
 msgid "GVFS Daemon"
-msgstr "GVFS Daemon"
+msgstr "GVFS àààà"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:65
 msgid "Main daemon for GVFS"
 msgstr "GVFS à àààààà daemon"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%1$s: %2$s"
 
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:82 ../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-mkdir.c:60
-#: ../programs/gvfs-move.c:111 ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128 ../programs/gvfs-tree.c:251
+#: ../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
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "àààà àààààà àààà \"%s --help\" ààààààà ààà"
 
-#: ../daemon/mount.c:459
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
-msgstr "spawn ààà ààààààà ààà ààààààà àààààààà ààà ààà"
+msgstr "spawn ààà ààààààà ààà ààààààà àààààààà àààà"
 
 #: ../daemon/mount.c:779
 #, c-format
 msgid "Automount failed: %s"
-msgstr "Automount ààà ààààà: %s"
+msgstr "Automount ààà ààààà: %s"
 
-#: ../daemon/mount.c:824 ../daemon/mount.c:898
+#: ../daemon/mount.c:825 ../daemon/mount.c:902
 msgid "The specified location is not mounted"
-msgstr "ààààààààà ààààà àààààà ààà ààà"
+msgstr "ààààààà ààà ààààà àààààà ààà ààà"
 
-#: ../daemon/mount.c:829
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
-msgstr "ààààààààà ààààààà ààààààà ààà"
+msgstr "ààààààà ààà ààààààà ààààààà ààà"
 
-#: ../daemon/mount.c:1036
+#: ../daemon/mount.c:1044
 msgid "Location is already mounted"
-msgstr "ààààààà àààààààà àààààà ààà àààà"
+msgstr "ààààààà àààààààà àààààà ààà"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1052
 msgid "Location is not mountable"
-msgstr "ààààààà àààààà ààà àààà àà"
+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
 #, c-format
 msgid "Can't find metadata file %s"
-msgstr "àààà-àààà ààààààà %s ààààààààà àààààà àààààà"
+msgstr "àààààààà ààààààà %s àààààà àààà ààààà"
 
 #: ../metadata/meta-daemon.c:160 ../metadata/meta-daemon.c:179
 msgid "Unable to set metadata key"
-msgstr "àààà-àààà àààà àààààààà àààààà àààààà"
+msgstr "àààààààà àààà ààààà ààà ààààà"
 
 #: ../metadata/meta-daemon.c:197 ../metadata/meta-daemon.c:399
 msgid "Unable to unset metadata key"
-msgstr "àààà-àààà ààààà àààààààà ààààà àààààà àààààà"
+msgstr "àààààààà ààààà àààààààà ààààà ààà ààààà"
 
 #: ../metadata/meta-daemon.c:428
 msgid "Unable to remove metadata keys"
-msgstr "àààà-àààà àààà àààààààà àààààà"
+msgstr "àààààààà àààà ààààààà àààààà"
 
 #: ../metadata/meta-daemon.c:459
 msgid "Unable to move metadata keys"
-msgstr "àààà-àààà àààà àààààààààà àààààà àààààà"
+msgstr "àààààààà àààà àààààààààà ààà ààààà"
 
 #: ../metadata/meta-daemon.c:704
 msgid "GVFS Metadata Daemon"
-msgstr "GVFS Metadata àààà"
+msgstr "GVFS àààààààà àààà"
 
 #: ../metadata/meta-daemon.c:707
 msgid "Metadata daemon for GVFS"
-msgstr "GVFS à àààà àààààààààààà Metadata àààà"
+msgstr "GVFS à àààà àààààààààààà  àààààààà àààà"
 
 #: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
 msgid "GVfs GDU Volume Monitor"
-msgstr "GVfs GDU ààààà àààààààà àààààààà"
+msgstr "GVfs GDU àààà ààààà"
 
 #: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
@@ -1539,68 +1841,68 @@ msgstr "àààààààà àààààà (%s)"
 msgid "Unnamed Drive"
 msgstr "ààà ààààà àààààà"
 
-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/hal/ghaldrive.c:662
+#: ../monitor/gdu/ggdudrive.c:561
 #, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
-msgstr "àààààààà àààààà ààààà àààààà; àààààà ààà ààà ààààà"
+msgid "Failed to eject medium; one or more volumes on the medium are busy."
+msgstr "ààààà ààà àà àààà àààààà àààààà; àààààà ààààà àààààà ààààààà"
 
-#: ../monitor/gdu/ggdudrive.c:1015
+#: ../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."
 msgstr ""
-"ààààààààà àààà àààààà ààààà ààà à'à àààà ?\n"
-"ààààààààà àààà àààààà àààààà ààààà, ààààààààà àààààààà àààà ààààà ààààààà àààààààà "
-"àààààà à'à'à ààà àààà ààà àààà ààà àààààààà ààààààà àààà àààà àààààà àààà àààà à"
+"ààààààààà ààààààà àààààà ààààà àààà àààà ?\n"
+"ààààààààà ààààààà àààààà àààààà ààààà, ààààààààà àààààààà àààà ààààà àààààà àààààààà "
+"àààààà à'à'à ààà àààà ààà àààààà ààà ààààààà ààààààà àààà àààà ààààà ààà ààààà"
 
-#: ../monitor/gdu/ggdudrive.c:1021
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
-msgstr "ààààà ààààà ààà à'à"
+msgstr "àààààà ààààà ààà"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
-msgstr "àà àààà àààààà ààààààààà àààààà àà-ààààààà àààà ààààààà àààààààà ààà àààà"
+msgstr "ààà àààà àààà ààààààààà àààààà ààààààààà ààààààà ààààààà àààààààà ààà àààà"
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
-msgstr "LUKS cleartext ààààà ààààààà àààààà àààààà"
+msgstr "LUKS cleartext àààààà ààààààà ààà ààààà"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
-msgstr "`%s' àààà ààà LUKS cleartext ààààà ààààààà àààààà àààààà"
+msgstr "`%s' ààà ààà LUKS cleartext àààààà ààààààà ààà ààààà"
 
-#: ../monitor/gdu/ggduvolume.c:325
+#: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
 msgstr "ààààà ààààà"
 
-#: ../monitor/gdu/ggduvolume.c:1075
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
 "The device \"%s\" contains encrypted data on partition %d."
 msgstr ""
-"ààààà àà-àà àààà àààà ààààààààà àààà\n"
-"\"%s\" ààààààà %d ààààààà ààààààààà ààà àààà ààààààà ààà à"
+"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"\"%s\" ààààààà %d ààààààà ààààààààà ààà àààà àààààààààààà"
 
-#: ../monitor/gdu/ggduvolume.c:1082
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
 "The device \"%s\" contains encrypted data."
 msgstr ""
-"ààààà àà-àà àààà àààà ààààààààà àààà\n"
-"\"%s\" ààààààà ààààààààà ààà àààà ààààààà ààà à"
+"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"\"%s\" ààààààà ààààààààà ààà àààà àààààààààààà"
 
-#: ../monitor/gdu/ggduvolume.c:1089
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
 "The device %s contains encrypted data."
 msgstr ""
-"ààààà àà-àà àààà àààà ààààààààà àààà\n"
-"%s ààààààà ààààààààà ààà àààà ààààààà ààà à"
+"àààà àà-àà àààà àààà àààààààà àààààà\n"
+"%s ààààààà ààààààààà ààà àààà àààààààààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "CD-ROM Disc"
@@ -1608,7 +1910,7 @@ msgstr "CD-ROM ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "Blank CD-ROM Disc"
-msgstr "ààààà CD-ROM ààààà"
+msgstr "ààààà CD-ROM ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
@@ -1616,7 +1918,7 @@ msgstr "CD-R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
-msgstr "ààààà CD-R ààààà"
+msgstr "ààààà CD-R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
@@ -1624,7 +1926,7 @@ msgstr "CD-RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
-msgstr "ààààà CD-RW ààààà"
+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
@@ -1634,7 +1936,7 @@ 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
 msgid "Blank DVD-ROM Disc"
-msgstr "ààààà DVD-ROM ààààà"
+msgstr "ààààà DVD-ROM ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "DVD-RAM Disc"
@@ -1642,7 +1944,7 @@ msgstr "DVD-RAM ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "Blank DVD-RAM Disc"
-msgstr "ààààà DVD-RAM ààààà"
+msgstr "ààààà DVD-RAM ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "DVD-RW Disc"
@@ -1650,7 +1952,7 @@ msgstr "DVD-RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
-msgstr "ààààà DVD-RW ààààà"
+msgstr "ààààà DVD-RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
@@ -1658,7 +1960,7 @@ msgstr "DVD+R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "Blank DVD+R Disc"
-msgstr "ààààà DVD+R ààààà"
+msgstr "ààààà DVD+R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
@@ -1666,7 +1968,7 @@ msgstr "DVD+RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
-msgstr "ààààà DVD+RW ààààà"
+msgstr "ààààà DVD+RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "DVD+R DL Disc"
@@ -1674,7 +1976,7 @@ msgstr "DVD+R DL ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "Blank DVD+R DL Disc"
-msgstr "ààààà DVD+R DL ààààà"
+msgstr "ààààà DVD+R DL ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blu-Ray Disc"
@@ -1682,7 +1984,7 @@ msgstr "Blu-Ray ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blank Blu-Ray Disc"
-msgstr "ààààà Blu-Ray ààààà"
+msgstr "ààààà Blu-Ray ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blu-Ray R Disc"
@@ -1690,7 +1992,7 @@ msgstr "Blu-Ray R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blank Blu-Ray R Disc"
-msgstr "ààààà Blu-Ray R ààààà"
+msgstr "ààààà Blu-Ray R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blu-Ray RW Disc"
@@ -1698,7 +2000,7 @@ msgstr "Blu-Ray RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blank Blu-Ray RW Disc"
-msgstr "ààààà Blu-Ray RW ààààà"
+msgstr "ààààà Blu-Ray RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "HD DVD Disc"
@@ -1706,7 +2008,7 @@ msgstr "HD DVD ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "Blank HD DVD Disc"
-msgstr "ààààà HD DVD ààààà"
+msgstr "ààààà HD DVD ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "HD DVD-R Disc"
@@ -1714,7 +2016,7 @@ msgstr "HD DVD-R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "Blank HD DVD-R Disc"
-msgstr "ààààà HD DVD-R ààààà"
+msgstr "ààààà HD DVD-R ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "HD DVD-RW Disc"
@@ -1722,7 +2024,7 @@ msgstr "HD DVD-RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "Blank HD DVD-RW Disc"
-msgstr "ààààà HD DVD-RW ààààà"
+msgstr "ààààà HD DVD-RW ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "MO Disc"
@@ -1730,7 +2032,7 @@ msgstr "MO ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "Blank MO Disc"
-msgstr "ààààà MO ààààà"
+msgstr "ààààà MO ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Disc"
@@ -1738,7 +2040,7 @@ msgstr "ààààà"
 
 #: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Blank Disc"
-msgstr "ààààà ààààà"
+msgstr "ààààà ààààà"
 
 #: ../monitor/hal/ghaldrive.c:127
 msgid "CD-ROM"
@@ -1824,7 +2126,7 @@ msgstr "%s àààààà"
 
 #: ../monitor/hal/ghaldrive.c:185
 msgid "Software RAID Drive"
-msgstr "àààààààààà RAID àààààà"
+msgstr "ààààààà RAID àààààà"
 
 #: ../monitor/hal/ghaldrive.c:187
 msgid "USB Drive"
@@ -1844,7 +2146,7 @@ msgstr "FireWire àààààà"
 
 #: ../monitor/hal/ghaldrive.c:197
 msgid "Tape Drive"
-msgstr "ààà àààààà"
+msgstr "àààà àààààà"
 
 #: ../monitor/hal/ghaldrive.c:199
 msgid "CompactFlash Drive"
@@ -1877,7 +2179,12 @@ msgstr "Thumb àààààà"
 
 #: ../monitor/hal/ghaldrive.c:214
 msgid "Mass Storage Drive"
-msgstr "àààà àààà àààààààà àààààà"
+msgstr "àààà àààààààà àààààà"
+
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+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
 #, c-format
@@ -1887,23 +2194,22 @@ msgstr "%.1f kB"
 #: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
-msgstr "%.1f àààààààà"
+msgstr "%.1f MB"
 
 #: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
-msgstr "%.1f àààààààà"
+msgstr "%.1f GB"
 
 #: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
-msgstr "àààà/àààà ààààààààà ààààà"
+msgstr "àààà'/àààà ààààààààà ààààà"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
-msgstr "%s àààààà"
+msgid "%s Medium"
+msgstr "%s àààààà"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -1911,41 +2217,47 @@ msgstr "%s àààààà"
 msgid "%s Encrypted Data"
 msgstr "%s ààààààààà ààà àààà"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "%s àààààà"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
-msgstr "ààààààà"
+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
 #, c-format
 msgid "%s: %s: error opening file: %s\n"
-msgstr "%s: %s: ààààààà ààààààà àààààà: %s\n"
+msgstr "%s: %s: ààààààà ààààààà àààààà: %s\n"
 
 #. Translators: the first %s is the program name, the
 #. second one is the URI of the file.
 #: ../programs/gvfs-cat.c:80
 #, c-format
 msgid "%s: %s, error writing to stdout"
-msgstr "%s: %s, stdout à ààààà àààààà"
+msgstr "%s: %s, stdout àà  àààààà àààààà"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
 #: ../programs/gvfs-cat.c:92
 #, c-format
 msgid "%s: %s: error reading: %s\n"
-msgstr "%s: %s: ààà àààààà àààààà: %s\n"
+msgstr "%s: %s: ààààà àààààà: %s\n"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
 #: ../programs/gvfs-cat.c:110
 #, c-format
 msgid "%s: %s:error closing: %s\n"
-msgstr "%s: %s:àààà àààààà àààààà: %s\n"
+msgstr "%s: %s:àààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-cat.c:136
 msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "LOCATION... - concatenate LOCATIONS to standard output."
+msgstr "LOCATION... - LOCATIONS -à àààààààà àààààààà àààààà àààà"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
@@ -1956,58 +2268,59 @@ msgid ""
 "files: for example you can use something like smb://server/resource/file.txt "
 "as location to concatenate."
 msgstr ""
-"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."
+"àààààààààààà àààààààààààà àààààà ààà ààà ààààààààà àààààààà ààààààà ààààààààààààà cat "
+"ààààààà ààà ààà ààà, àààààà ààààààà àààààààààààà àààààààà gvfs ààààààà ààààààà ààà:"
+"ààààààààààààà ààààà smb://server/resource/file.txt -à ààààààà àààààà ààààààà "
+"àààààààààà ààààààà"
 
 #: ../programs/gvfs-cat.c:148
 msgid ""
 "Note: just pipe through cat if you need its formatting option like -n, -T or "
 "other."
 msgstr ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
+"àààà: 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-mkdir.c:58 ../programs/gvfs-move.c:109
-#: ../programs/gvfs-open.c:138 ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126 ../programs/gvfs-tree.c:249
+#: ../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
 #, c-format
 msgid "Error parsing commandline options: %s\n"
-msgstr "àààààà-ààààà ààà àààààààààààà àààààà àààààààà àààààà àààààà: %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:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
-msgstr "%s: ààààààà ààààààààà"
+msgstr "%s: ààààààà ààà"
 
 #: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
 msgid "no target directory"
-msgstr "àààààà ààààààà ààààààààà"
+msgstr "àààààà ààààààààà ààà"
 
 #: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
 msgid "show progress"
-msgstr "ààààààà àààà àààààààà ààà à'à"
+msgstr "àààààà àààààààà"
 
 #: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
 msgid "prompt before overwrite"
-msgstr "àààààà ààààà àààààà ààààà ààà à'à"
+msgstr "àààààà ààààà àààààà ààààà ààà"
 
 #: ../programs/gvfs-copy.c:47
 msgid "preserve all attributes"
-msgstr "àààà ààààààààà àààààààààà ààà à'à"
+msgstr "àààà ààààààààà àààààààààà àààà"
 
 #: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
 msgid "backup existing destination files"
-msgstr "àààààààà ààààààà àààààààààààà ààààààààààà ààà-àà ààà à'à"
+msgstr "àààààààà ààààààààààà àààààààààààà ààààààààààà ààààà ààà"
 
 #: ../programs/gvfs-copy.c:49
 msgid "never follow symbolic links"
-msgstr "ààààààààà àààà ààààààà àààààà ààà à'à'à"
+msgstr "àààààààà àààà ààààààà àààààà ààààà"
 
 #: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
 #, c-format
@@ -2020,16 +2333,16 @@ msgstr "SOURCE... DEST - ààààààààààà àààà àà
 
 #: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
 msgid "Missing operand\n"
-msgstr "operand ààààààààà\n"
+msgstr "àààààààà ààààààààà\n"
 
 #: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
 msgid "Too many arguments\n"
-msgstr "àààààààà àààà ààààààà ààà\n"
+msgstr "àààààà àààà\n"
 
 #: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 #, c-format
 msgid "Target %s is not a directory\n"
-msgstr "%s àààààààààà àààà ààààààà ààà\n"
+msgstr "%s àààààààààà ààà ààààààààà ààà\n"
 
 #: ../programs/gvfs-copy.c:193
 #, c-format
@@ -2039,15 +2352,15 @@ msgstr "%s àààààà àààà à'à àààà ?"
 #: ../programs/gvfs-copy.c:207
 #, c-format
 msgid "Error copying file %s: %s\n"
-msgstr "%s ààààààà ààà àààààà àààààà: %s\n"
+msgstr "%s ààààààà ààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-info.c:37
 msgid "List writable attributes"
-msgstr "àààààààààà àààààààààà àààààà"
+msgstr "àààààààààà àààààààààààààà àààààà"
 
 #: ../programs/gvfs-info.c:38
 msgid "Get filesystem info"
-msgstr "ààààààà-ààààààà ààààààààà àààà ààààààà ààà"
+msgstr "àààààààààààààà àààà ààààààà ààà"
 
 #: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "The attributes to get"
@@ -2056,11 +2369,11 @@ msgstr "ààààààà àààà àààà ààààààà 
 #: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
 msgid "Don't follow symlinks"
-msgstr "ààààààààà àààà àààààà ààà à'à'à"
+msgstr "àààààààà àààà àààààà ààààà"
 
 #: ../programs/gvfs-info.c:50
 msgid "invalid type"
-msgstr "àààà ààà"
+msgstr "àààà ààà"
 
 #: ../programs/gvfs-info.c:53
 msgid "unknown"
@@ -2072,11 +2385,11 @@ msgstr "àààààà"
 
 #: ../programs/gvfs-info.c:59
 msgid "directory"
-msgstr "ààààààà"
+msgstr "ààààààààà"
 
 #: ../programs/gvfs-info.c:62
 msgid "symlink"
-msgstr "ààààààààà-àààà"
+msgstr "àààààààà ààààà"
 
 #: ../programs/gvfs-info.c:65
 msgid "special"
@@ -2084,7 +2397,7 @@ msgstr "ààààà"
 
 #: ../programs/gvfs-info.c:68
 msgid "shortcut"
-msgstr "àààà-ààà"
+msgstr "ààààààà"
 
 #: ../programs/gvfs-info.c:71
 msgid "mountable"
@@ -2093,17 +2406,17 @@ msgstr "àààààà àààà ààààà"
 #: ../programs/gvfs-info.c:109
 #, c-format
 msgid "attributes:\n"
-msgstr "ààààààààà:\n"
+msgstr "ààààààààààààà:\n"
 
 #: ../programs/gvfs-info.c:155
 #, c-format
 msgid "display name: %s\n"
-msgstr "ààààààààààààà ààà: %s\n"
+msgstr "ààààààààà ààà: %s\n"
 
 #: ../programs/gvfs-info.c:159
 #, c-format
 msgid "edit name: %s\n"
-msgstr "ààà àààààààà: %s\n"
+msgstr "ààà àààààààà ààà: %s\n"
 
 #: ../programs/gvfs-info.c:165
 #, c-format
@@ -2113,12 +2426,12 @@ msgstr "ààà: %s\n"
 #: ../programs/gvfs-info.c:172
 #, c-format
 msgid "type: %s\n"
-msgstr "ààà: %s\n"
+msgstr "ààà: %s\n"
 
 #: ../programs/gvfs-info.c:178
 #, c-format
 msgid "size: "
-msgstr "ààà: "
+msgstr "àààà: "
 
 #: ../programs/gvfs-info.c:183
 #, c-format
@@ -2127,42 +2440,42 @@ msgstr "àààààà\n"
 
 #: ../programs/gvfs-info.c:266
 msgid "Copy with file"
-msgstr "ààààààà àààààà ààà ààà à'à"
+msgstr "àààààààà àààà ààà ààà"
 
 #: ../programs/gvfs-info.c:270
 msgid "Keep with file when moved"
-msgstr "àààààààààà ààààà àààààààà àààà ààà à'à"
+msgstr "àààààààààà ààààà àààààààà àààà àààà"
 
 #: ../programs/gvfs-info.c:307
 #, c-format
 msgid "Error getting writable attributes: %s\n"
-msgstr "ààààà ààààà ààààààààà ààààààà àààààà àààààà: %s\n"
+msgstr "ààààà ààààà ààààààààà ààààààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-info.c:312
 #, c-format
 msgid "Settable attributes:\n"
-msgstr "ààààààààààààà ààààààààà:\n"
+msgstr "ààààààààààààà ààààààààààààà:\n"
 
 #: ../programs/gvfs-info.c:335
 #, c-format
 msgid "Writable attribute namespaces:\n"
-msgstr "ààààà ààààà àààààààààà ààà-ààààà:\n"
+msgstr "ààààà ààààà àààààààààà ààààààààààààà:\n"
 
 #: ../programs/gvfs-info.c:362
 msgid "- show info for <location>"
-msgstr "- <location> ààààààààà àààà àààààààà ààà à'à"
+msgstr "<location> -à àààà àààààààà"
 
 #: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
-msgstr "àààààà ààààààà àààààààà ààà à'à"
+msgstr "àààààà ààààààà àààààààà"
 
 #: ../programs/gvfs-ls.c:41
 msgid "Use a long listing format"
-msgstr "àà-ààààààà ààààààà ààààààà ààà à'à"
+msgstr "ààà àààà ààààààààààà ààààààà ààààààà ààà"
 
 #: ../programs/gvfs-ls.c:42
 msgid "Show completions"
-msgstr "àààààààà àààà àààà àààà àààààààà ààà à'à"
+msgstr "àààààààà àààà àààà àààà àààààààà"
 
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
 #: ../programs/gvfs-rename.c:69
@@ -2172,166 +2485,216 @@ msgstr "àààààà: %s\n"
 
 #: ../programs/gvfs-ls.c:383
 msgid "- list files at <location>"
-msgstr "- <location> à ààààààà àààààààà àààààà"
+msgstr "<location> à ààààààààààà ààààààààààà ààààààààààà ààà"
+
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "àààà-àààà àààà àààààà àààààààààà"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "àààà-àààà àààà àààààààààà ààààà ààà"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "<mimetype> -à àààà àààààààààà - ààààààà ààà/ààààà ààà"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "--query ààà --set -à ààà ààààààà ààà"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "ààà àààà-ààà ààààààà àààà àààààà\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "ààààààààà àààààààààààà àààààà ààà àààà-ààà ààààààà àààà àààààà\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "'%s' -à àààà àààà ààààààà ààààààààà ààà\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "'%s' -à àààà ààààààà ààààààààà: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "ààààààààà ààà ààààààààààààà:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "àààààààààà '%s' -à àààà àààà à'à àààààà àààààà\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "'%s' -à àààà  '%s' -à ààààààààà àààààààààà àààààà ààààà àààààà àààààà: %s\n"
 
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
-msgstr "àààààààà ààààààà ààààààà ààà à'à"
+msgstr "àààààà ààààààààààààà àààààà ààà"
 
 #: ../programs/gvfs-mkdir.c:51
-#| msgid "create parent directories"
 msgid "- create directories"
-msgstr "-ààààààààààààà àààààà ààà"
+msgstr "ààààààààààààà àààààà ààà"
 
 #: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
-msgstr "ààààààà ààààààà àààààà àààààà: %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 àààààààà ààààà"
+msgstr "àààà MOVED àààààààà àààààà"
 
 #: ../programs/gvfs-mount.c:54
 msgid "Mount as mountable"
-msgstr "àààààà àààà ààààà àààààà ààààààà àààààà àààààà ààà à'à"
+msgstr "àààààà àààà ààààà àààààà  àààààà ààà"
 
 #: ../programs/gvfs-mount.c:55
 msgid "Mount volume with device file"
-msgstr "àààààà ààààààà àààààà ààààà àààààà ààà à'à"
+msgstr "àààààà ààààààà àààààà àààà àààààà ààà"
 
 #: ../programs/gvfs-mount.c:56
 msgid "Unmount"
-msgstr "àà-àààààà ààà à'à"
+msgstr "àààààààà ààà"
 
 #: ../programs/gvfs-mount.c:57
 msgid "Unmount all mounts with the given scheme"
-msgstr "àààààààà ààààà àà àààà àààààà àà-àààààà ààà à'à"
+msgstr "àààààààà ààààà àà àààà àààààà àààààààà ààà"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
 msgstr "àààààà"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
-msgstr "àààààà ààà àààààààà àààààààà àààààààà àààà àààààààà ààà à'à"
+msgstr "àààààà ààà ààààà àààààààà àààààààà àààà àààààààà"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
-msgstr "àààà àààààààà ààà à'à"
+msgstr "àààààààà àààààààà ààà"
 
-#: ../programs/gvfs-mount.c:163 ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
-msgstr "ààààààà àààààà àààààà àààààà: %s\n"
+msgstr "ààààààà àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
-msgstr "àààààà àà-àààààà àààààà àààààà: %s\n"
+msgstr "àààààà àààààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
-msgstr "ààààààààà àààààà àààààà àààààà àààààà: %s\n"
+msgstr "àààààà àààààà àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:682
+#: ../programs/gvfs-mount.c:683
 #, c-format
 msgid "Error mounting %s: %s\n"
-msgstr "%s àààààà àààààà àààààà: %s\n"
+msgstr "%s àààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:697
 #, c-format
 msgid "Mounted %s at %s\n"
-msgstr "%s à %s à àààààà ààà àààà\n"
+msgstr "%s -à %s à àààààà ààà àààà\n"
 
-#: ../programs/gvfs-mount.c:747
+#: ../programs/gvfs-mount.c:748
 #, c-format
 msgid "No volume for device file %s\n"
-msgstr "àààààà ààààààà %s à àààà àààà ààààà ààààààà ààà\n"
+msgstr "àààààà ààààààà %s à àààà àààà àààà ààààààà ààà\n"
 
-#: ../programs/gvfs-mount.c:938
+#: ../programs/gvfs-mount.c:939
 msgid "- mount <location>"
-msgstr "- <location> àààààà ààà à'à"
+msgstr "<location> àààààà ààà"
 
 #: ../programs/gvfs-move.c:103
 msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
-msgstr "SOURCE... DEST - ààààààààààà àààà ààà ààààààààà ààà ààà"
+msgstr "SOURCE... DEST - ààààààààààà àààà ààà ààààààààà àààààààààà ààà"
 
 #: ../programs/gvfs-move.c:189
 #, c-format
 msgid "Error moving file %s: %s\n"
-msgstr "%s ààààààà ààààààààà àààààà: %s\n"
+msgstr "%s ààààààà àààààààààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-open.c:37
 msgid "files"
-msgstr "ààààààà"
+msgstr "ààààààààààà"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
 #: ../programs/gvfs-open.c:65
 #, c-format
 msgid "%s: %s: error opening location: %s\n"
-msgstr "%s: %s: ààààààà ààààààà ààààààà àààààà: %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"
+msgstr "%s: %s: ààààààààà ààààà ààààà àààààà: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
-msgstr "FILES... - open FILES with registered application."
+msgstr "FILES... - ààààààààààà àààààààààààààà àààà FILES ààààà"
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
+#: ../programs/gvfs-open.c:127
 msgid ""
 "Opens the file(s) with the default application registered to handle the type "
 "of the file."
 msgstr ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
+"ààààààà ààà ààààààààààà àààààà ààààààààààà ààààààààà àààààààààà àààà ààààààà(àààà) "
+"ààààà "
 
 #: ../programs/gvfs-rename.c:50
 msgid "- rename file"
-msgstr "- àààààààà ààà àààààààà"
+msgstr "- ààààààà àààà ààààààà ààà"
 
 #: ../programs/gvfs-rename.c:76
 #, c-format
 msgid "Rename successful. New uri: %s\n"
-msgstr "ààààààà àààà ààà àààààààà ààà àààà à àààà 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 "àààà ààààààà ààààààà ààà, ààààààà ààààà ààààà"
 
 #: ../programs/gvfs-rm.c:53
 msgid "- delete files"
-msgstr "- ààààààà ààààààà"
+msgstr "- ààààààààààà ààà àààààà"
 
 #: ../programs/gvfs-save.c:43
 msgid "Create backup"
-msgstr "ààà-àà ààààààà ààà"
+msgstr "ààààà àààààà ààà"
 
 #: ../programs/gvfs-save.c:44
 msgid "Only create if not existing"
-msgstr "ààà ààààààà àààààààà àààààà ààà à'à"
+msgstr "ààà ààààààà àààààààà àààààà ààà"
 
 #: ../programs/gvfs-save.c:45
 msgid "Append to end of file"
-msgstr "àààààààà àààà ààà ààà à'à"
+msgstr "àààààààà àààà ààà ààà"
 
 #: ../programs/gvfs-save.c:46
 msgid "When creating a file, restrict access to the current user only"
-msgstr ""
-"ààààààà àààààààà ààà, ààà ààààààà ààààààààààààà àààà àààààààà àààààà ààààà ààà à'à"
+msgstr "ààààààà ààààààà ààà, ààà ààààààà àààààààààààà àààà àààààààà àààààà ààààà ààà"
 
 #: ../programs/gvfs-save.c:47
 msgid "Print new etag at end"
-msgstr "àààà àààà etag ààààààà ààà à'à"
+msgstr "àààà àààà etag ààààààà ààà"
 
 #: ../programs/gvfs-save.c:48
 msgid "The etag of the file being overwritten"
@@ -2340,16 +2703,16 @@ msgstr "àààààà ààààà àààà ààààààà 
 #: ../programs/gvfs-save.c:76
 #, c-format
 msgid "Error opening file: %s\n"
-msgstr "ààààààà ààààààà àààààà: %s\n"
+msgstr "ààààààà ààààààà àààààà: %s\n"
 
 #: ../programs/gvfs-save.c:109
 msgid "Error reading stdin"
-msgstr "stdin àààààà àààààà"
+msgstr "stdin àààààà àààààà"
 
 #: ../programs/gvfs-save.c:122
 #, c-format
 msgid "Error closing: %s\n"
-msgstr "àààà àààààà àààààà: %s\n"
+msgstr "àààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-save.c:134
 #, c-format
@@ -2358,17 +2721,14 @@ msgstr "Etag àààààà ààà\n"
 
 #: ../programs/gvfs-save.c:156
 msgid "DEST - read from standard input and save to DEST"
-msgstr "DEST - ààààààààà àààààà ààà ààà ààà àààààààà ààààà ààà"
+msgstr "DEST - ààààààààà àààààà ààà ààà ààà àààààààà ààààààà ààà"
 
 #: ../programs/gvfs-set-attribute.c:36
-#| msgid ""
-#| "attribute type [string, bytestring, boolean, uint32, int32, uint64, "
-#| "int64, stringv]"
 msgid ""
 "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
 "stringv, unset]"
 msgstr ""
-"àààààààààà ààà [string, bytestring, boolean, uint32, int32, uint64, int64, "
+"àààààààààà ààà [string, bytestring, boolean, uint32, int32, uint64, int64, "
 "stringv]"
 
 #: ../programs/gvfs-set-attribute.c:119
@@ -2378,45 +2738,63 @@ msgstr " <location> <attribute> <values> - ààààààààà ààà
 #: ../programs/gvfs-set-attribute.c:137
 #, c-format
 msgid "Location not specified\n"
-msgstr "ààààààà ààààààà ààà ààà\n"
+msgstr "ààààààà ààààààà ààà àààà ààà\n"
 
 #: ../programs/gvfs-set-attribute.c:145
 #, c-format
 msgid "Attribute not specified\n"
-msgstr "ààààààààà ààààààà ààà ààà\n"
+msgstr "ààààààààà ààààààà ààà àààà ààà\n"
 
 #: ../programs/gvfs-set-attribute.c:154
 #, c-format
-#| msgid "Attribute not specified\n"
 msgid "Value not specified\n"
 msgstr "ààà ààààààà ààà àààà ààà\n"
 
 #: ../programs/gvfs-set-attribute.c:194
 #, c-format
 msgid "Invalid attribute type %s\n"
-msgstr "àààààààààà ààà %s ààà ààà\n"
+msgstr "àààààààààà ààà %s àààà\n"
 
 #: ../programs/gvfs-set-attribute.c:204
 #, c-format
 msgid "Error setting attribute: %s\n"
-msgstr "ààààààààà àààààààà àààààà àààààà: %s\n"
+msgstr "ààààààààà ààààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-trash.c:52
 msgid "- move files to trash"
-msgstr "- ààààààààààà àààààààà àààààààààà ààà à'à"
+msgstr "- ààààààààààà àààààààà àààààààààà ààà"
 
 #: ../programs/gvfs-trash.c:69
 #, c-format
 msgid "Error trashing file: %s\n"
-msgstr "àààààààà ààààààà àààààààà àààààà: %s\n"
+msgstr "àààààààà ààààààà ààààà àààààà: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
-msgstr "ààààààààà àààà, àààààà ààà àààà-ààà àààà dirs àààààà ààà à'à"
+#| msgid "Follow symlinks, mounts and shortcuts like dirs"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
+msgstr "àààààààà ààààà, àààààà ààà ààààààà àààà ààààààààààààà àààààà ààà"
 
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
-msgstr "- ààààà àààààà àààààààà àààààààà ààààààààààà àààààààà àààààà àààààààà ààà à'à"
+msgstr "- ààààà àààààà àààààààà àààààààààà ààààààà ààààààààààà ààà"
+
+#~ msgid "Unhandled Inst proxy error (%d)"
+#~ msgstr "ààààààààààà àààààà ààààààà àààààà (%d)"
+
+#~ msgid "Unhandled SBServices proxy error (%d)"
+#~ msgstr "ààààààààààà SBServices ààààààà àààààà (%d) "
+
+#~ msgid "ftp on %s"
+#~ msgstr "%s -à ftp"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "àààààààààà àààà ààààààà ààààà àààààà"
+
+#~ msgid "sftp on %s"
+#~ msgstr "%s -à sftp"
+
+#~ msgid "Service %d on Apple Mobile Device"
+#~ msgstr "Apple àààààà ààààààà %d àààà"
 
 #~ msgid "Invalid return value from get_info"
 #~ msgstr "get_infoà ààà ààààààà ààà àààà ààà"
@@ -2444,7 +2822,7 @@ msgstr "- ààààà àààààà àààààààà ààà
 
 #
 #~ msgid "Enter password"
-#~ msgstr "ààààààààà àààà"
+#~ msgstr "àààààààà àààààà"
 
 #~ msgid "- output files at <location>"
 #~ msgstr "- <location> à ààààààà àààààà ààààààà"
@@ -2453,10 +2831,10 @@ msgstr "- ààààà àààààà àààààààà ààà
 #~ msgstr "ààààààààà ààààà"
 
 #~ msgid "Could not connect to host"
-#~ msgstr "ààààààà àààà ààààà ààààààà àààààà"
+#~ msgstr "àààààà àààà ààààà ààààààà àààààà"
 
 #~ msgid "filename too long"
-#~ msgstr "àààààà ààà àààààààà ààààà"
+#~ msgstr "àààààà ààà àààààà àààà"
 
 #~ msgid "Invalid destination filename"
 #~ msgstr "àààààààà àààààà ààà àààà àà"



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