[gvfs] Updated Marathi Translations



commit de93fcf03b7ca6f7a83e5a83cd1df05a83b7c2c7
Author: Sandeep Sheshrao Shedmake <sshedmak redhat com>
Date:   Thu Sep 13 12:20:36 2012 +0530

    Updated Marathi Translations

 po/mr.po | 1228 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 601 insertions(+), 627 deletions(-)
---
diff --git a/po/mr.po b/po/mr.po
index dde1f03..94d5d32 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -9,10 +9,10 @@ msgstr ""
 "Project-Id-Version: mr\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?";
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-08-09 20:16+0000\n"
-"PO-Revision-Date: 2012-08-14 13:54+0530\n"
+"POT-Creation-Date: 2012-09-07 18:36+0000\n"
+"PO-Revision-Date: 2012-09-13 12:19+0530\n"
 "Last-Translator: Sandeep Shedmake <sshedmak redhat com>\n"
-"Language-Team: Marathi <fedora-trans-mr redhat com>\n"
+"Language-Team: Marathi <maajhe-sanganak freelists org>\n"
 "Language: mr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,7 +36,6 @@ msgstr "ààààààà àààà àààààààààà àà
 
 #: ../client/gdaemonfile.c:1356
 #, c-format
-#| msgid "Invalid return value from open"
 msgid "Invalid return value from %s"
 msgstr "%s ààààà àààà àààààà ààààà"
 
@@ -51,13 +50,13 @@ msgstr "àààààààààà ààààà àààà àààà
 msgid "Invalid filename %s"
 msgstr "àààà ààààààà %s"
 
-#: ../client/gdaemonfile.c:2609 ../client/gdaemonvfs.c:1286
-#: ../client/gdaemonvfs.c:1338
+#: ../client/gdaemonfile.c:2609 ../client/gdaemonvfs.c:1290
+#: ../client/gdaemonvfs.c:1342
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "àààà àààààààà ààà àààààààà àààààà ààààà: %s"
 
-#: ../client/gdaemonfile.c:2610 ../client/gdaemonvfs.c:1339
+#: ../client/gdaemonfile.c:2610 ../client/gdaemonvfs.c:1343
 msgid "values must be string or list of strings"
 msgstr "ààààà àààààààà ààààà ààààààààààà àààà àààààà ààà"
 
@@ -71,22 +70,22 @@ msgstr "ààààà àààààààà ààààà ààààà
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:727
-#: ../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
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:726
+#: ../daemon/gvfsbackendobexftp.c:1111 ../daemon/gvfsbackendobexftp.c:1132
+#: ../daemon/gvfsbackendobexftp.c:1251 ../daemon/gvfsbackendobexftp.c:1388
+#: ../daemon/gvfsbackendobexftp.c:1452 ../daemon/gvfsbackendobexftp.c:1654
+#: ../daemon/gvfsbackendobexftp.c:1761 ../daemon/gvfsbackendobexftp.c:1923
+#: ../daemon/gvfsbackendobexftp.c:1950 ../daemon/gvfsbackendobexftp.c:2009
+#: ../daemon/gvfsbackendobexftp.c:2031 ../daemon/gvfsbackendobexftp.c:2094
+#: ../daemon/gvfsbackendobexftp.c:2113 ../daemon/gvfsbackendsmb.c:1180
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
 #: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1070
-#: ../monitor/proxy/gproxydrive.c:522 ../monitor/proxy/gproxydrive.c:610
-#: ../monitor/proxy/gproxydrive.c:760 ../monitor/proxy/gproxydrive.c:898
-#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1061
-#: ../monitor/proxy/gproxymount.c:475 ../monitor/proxy/gproxymount.c:560
-#: ../monitor/proxy/gproxyvolume.c:829 ../monitor/proxy/gproxyvolume.c:892
+#: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635
+#: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923
+#: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086
+#: ../monitor/proxy/gproxymount.c:501 ../monitor/proxy/gproxymount.c:586
+#: ../monitor/proxy/gproxyvolume.c:853 ../monitor/proxy/gproxyvolume.c:916
 msgid "Operation was cancelled"
 msgstr "ààààà àààà ààààààà ààà"
 
@@ -114,21 +113,11 @@ msgstr "ààààààààà àààà"
 msgid "Seek not supported on stream"
 msgstr "àààààààààà ààà ààààààà àààà"
 
-#: ../client/gdaemonvfs.c:810
+#: ../client/gdaemonvfs.c:814
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "ààààà àààààà ààààààà àààààààà àààààà: %s"
 
-#: ../common/gsysutils.c:136
-#, c-format
-msgid "Error creating socket: %s"
-msgstr "ààààà àààààààààà àààààà: %s"
-
-#: ../common/gsysutils.c:174
-#, c-format
-msgid "Error connecting to socket: %s"
-msgstr "ààààààà àààààà àààààààà àààààà: %s"
-
 #: ../common/gvfsdaemonprotocol.c:349
 msgid "Invalid file info format"
 msgstr "àààà àààà àààààà ààààààà"
@@ -200,50 +189,47 @@ msgstr "GVfsIcon ààààà àààààà ààààà àààà
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
-#: ../daemon/daemon-main.c:108
+#: ../daemon/daemon-main.c:100
 #, c-format
-#| msgid "%s Filesystem Service"
 msgid "%s File System Service"
 msgstr "%s àààà àààààà àààààààà"
 
-#: ../daemon/daemon-main.c:184 ../daemon/daemon-main.c:314
-#: ../programs/gvfs-copy.c:90 ../programs/gvfs-move.c:78
-#: ../programs/gvfs-rename.c:36 ../programs/gvfs-set-attribute.c:105
+#: ../daemon/daemon-main.c:178 ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78 ../programs/gvfs-rename.c:36
+#: ../programs/gvfs-set-attribute.c:105
 #, c-format
 msgid "Error: %s"
 msgstr "ààà: %s"
 
-#: ../daemon/daemon-main.c:241
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "àààààà: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:265 ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:260 ../daemon/daemon-main.c:278
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "àààààà: %s àààààààà=ààààà àààààààà=ààààà ..."
 
-#: ../daemon/daemon-main.c:281
+#: ../daemon/daemon-main.c:276
 #, c-format
 msgid "No mount type specified"
 msgstr "ààààà àààààà ààààààààà àààà"
 
-#: ../daemon/daemon-main.c:313
+#: ../daemon/daemon-main.c:308
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s ààààà ààààààààààà ààààààààà ààààààà ààà"
 
-#: ../daemon/daemon-main.c:337
+#: ../daemon/daemon-main.c:329
 msgid "error starting mount daemon"
 msgstr "ààààà àààà àààà ààààààà àààààà"
 
 #: ../daemon/gvfsafpconnection.c:764
-#| msgid "The specified location is not mounted"
 msgid "The connection is not opened"
 msgstr "ààààà ààààà àààà"
 
 #: ../daemon/gvfsafpconnection.c:771
-#| msgid "Data connection closed"
 msgid "The connection is closed"
 msgstr "ààààà ààà àààà"
 
@@ -255,106 +241,119 @@ msgstr "ààààà ààààààààààààààà ààà
 msgid "Got EOS"
 msgstr "EOS ààààààà"
 
-#: ../daemon/gvfsafpserver.c:197 ../daemon/gvfsafpserver.c:476
+#: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
-msgid "Server doesn't support passwords longer than %d characters"
-msgstr "%d àààààààààààààààààà ààààààààà àààààààààààà ààààààà àààààà ààààà àààà"
+#| msgid "Server doesn't support passwords longer than %d characters"
+msgid "The server doesn't support passwords longer than %d character."
+msgid_plural "The server doesn't support passwords longer than %d characters."
+msgstr[0] ""
+"%d àààààààààààààààààà ààààààààà àààààààààààà ààààààà àààààà ààààà àààà."
+msgstr[1] ""
+"%d àààààààààààààààààà ààààààààà àààààààààààà ààààààà àààààà ààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:221 ../daemon/gvfsafpserver.c:527
-msgid "An invalid username was provided"
-msgstr "àààà àààààààààààà àààààà"
+#: ../daemon/gvfsafpserver.c:224 ../daemon/gvfsafpserver.c:533
+#| msgid "An invalid username was provided"
+msgid "An invalid username was provided."
+msgstr "àààà àààààààààààà àààààà."
 
-#: ../daemon/gvfsafpserver.c:390 ../daemon/gvfsafpserver.c:617
+#: ../daemon/gvfsafpserver.c:393
 #, c-format
-msgid "AFP server %s declined the submitted password"
-msgstr "AFP ààààààà %s àà àààààààà ààààààà àààààà"
+msgid "Unable to login to the server â%sâ with the given password."
+msgstr "àààààààà ààààààààà ààààààà â%sâ ààààà àààààà àààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:425 ../daemon/gvfsafpserver.c:644
-#: ../daemon/gvfsafpserver.c:817 ../daemon/gvfsafpserver.c:863
-#: ../daemon/gvfsafpserver.c:942 ../daemon/gvfsafpserver.c:1316
-#: ../daemon/gvfsafpserver.c:1618 ../daemon/gvfsafpserver.c:1707
+#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650
+#: ../daemon/gvfsafpserver.c:825 ../daemon/gvfsafpserver.c:873
+#: ../daemon/gvfsafpserver.c:989 ../daemon/gvfsafpserver.c:1672
 #, c-format
-#| msgid "Unexpected reply from server"
-msgid "Received invalid reply from server"
-msgstr "ààààà ààààà ààààààààà àààààààà ààààààà àààà"
+msgid "Unable to connect to the server â%sâ. A communication problem occurred."
+msgstr "ààààààà â%sâ àà ààààà ààààà. àààààà àààààààà àààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:669 ../daemon/gvfsafpserver.c:694
+#: ../daemon/gvfsafpserver.c:623
 #, c-format
-msgid "AFP server %s doesn't support anonymous login"
-msgstr "AFP ààààààà %s àààààà ààààààààààà àààààà ààààà àààà"
+msgid "Unable to connect to the server â%sâ with the given password."
+msgstr "àààààààà ààààààààà ààààààà â%sâ ààààà ààààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:722
+#: ../daemon/gvfsafpserver.c:676 ../daemon/gvfsafpserver.c:701
 #, c-format
-msgid ""
-"Login to AFP server %s failed (no suitable authentication mechanism found)"
-msgstr "AFP ààààààà %s ààààà àààààà ààààà (ààààà àààààààààà àààààà ààààà àààà)"
+#| msgid "AFP server %s doesn't support anonymous login"
+msgid "The server â%sâ doesn't support anonymous access."
+msgstr "AFP ààààààà â%sâ àààààà ààààààààààà àààààà ààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:796 ../daemon/gvfsafpserver.c:817
+#: ../daemon/gvfsafpserver.c:729
 #, c-format
-#| msgid "Failed to get folder list"
-msgid "Failed to connect to server (%s)"
-msgstr "ààààààà (%s) àà ààààà ààààà"
+#| msgid ""
+#| "Login to AFP server %s failed (no suitable authentication mechanism found)"
+msgid ""
+"Unable to connect to the server â%sâ. No suitable authentication mechanism "
+"was found."
+msgstr ""
+"AFP ààààààà â%sâ ààààà àààààà ààààà. ààààà àààààààààà àààààà ààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:796
-msgid "Server doesn't support AFP version 3.0 or later"
-msgstr "ààààààà AFP ààààààà 3.0 ààààà àààààààààà àààààà ààààà àààà"
+#: ../daemon/gvfsafpserver.c:803
+#, c-format
+#| msgid "Server doesn't support AFP version 3.0 or later"
+msgid ""
+"Unable to connect to the server â%sâ. The server doesn't support AFP version "
+"3.0 or later."
+msgstr ""
+"AFP ààààààà â%sâ ààààà àààààà ààààà. ààààààà AFP ààààààà 3.0 ààààà àààààààààà "
+"àààààà ààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:904 ../daemon/gvfsafpvolume.c:390
-#: ../daemon/gvfsafpvolume.c:668 ../daemon/gvfsafpvolume.c:821
-#: ../daemon/gvfsafpvolume.c:1015 ../daemon/gvfsafpvolume.c:1215
-#: ../daemon/gvfsafpvolume.c:1398 ../daemon/gvfsafpvolume.c:1555
-#: ../daemon/gvfsafpvolume.c:2001 ../daemon/gvfsafpvolume.c:2127
-#: ../daemon/gvfsafpvolume.c:2289 ../daemon/gvfsafpvolume.c:2509
-#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendsftp.c:311
-#: ../daemon/gvfsbackendsftp.c:1833 ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsafpserver.c:914
 #, c-format
-msgid "Permission denied"
-msgstr "ààààààà ààààààà"
+#| msgid "Permission denied"
+msgid "Permission denied."
+msgstr "ààààààà ààààààà."
 
-#: ../daemon/gvfsafpserver.c:909
+#: ../daemon/gvfsafpserver.c:919
 #, c-format
-#| msgid "Symlinks not supported by backend"
-msgid "Command is not supported by server"
-msgstr "àààà àààààààààààà ààààààà àààà"
+#| msgid "Command is not supported by server"
+msgid "The command is not supported by the server."
+msgstr "àààà àààààààààààà ààààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:913
+#: ../daemon/gvfsafpserver.c:923
 #, c-format
-msgid "User's password has expired"
-msgstr "ààààààààààààààà ààààààààà àààààààààà ààààà"
+#| msgid "User's password has expired"
+msgid "Your password has expired."
+msgstr "ààààààààà àààààààààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:917
+#: ../daemon/gvfsafpserver.c:927
 #, c-format
-msgid "User's password needs to be changed"
-msgstr "ààààààààààààà ààààààà ààààà àààààà"
+#| msgid "User's password needs to be changed"
+msgid "Your password needs to be changed."
+msgstr "ààààààààà ààààà àààààà."
 
-#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsafpserver.c:1022
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:1070
 #, c-format
-#| msgid "Enter password for ftp as %s on %s"
-msgid "Enter password for afp as %s on %s"
-msgstr "%s àààààà %s ààààà, afp àààà ààààààà àààà"
+#| msgid "Enter password for ssh on %s"
+msgid "Enter your password for the server â%sâ."
+msgstr "ààààààà â%sâ ààààà ààààààà àààà."
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsafpserver.c:1025
+#: ../daemon/gvfsafpserver.c:1073
 #, c-format
-#| msgid "Enter password for ftp on %s"
-msgid "Enter password for afp on %s"
-msgstr "%s àààà afp ààààà ààààààà àààà"
+msgid "Enter your name and password for the server â%sâ."
+msgstr "ààààààà â%sâ ààààà ààà à ààààààà àààà."
 
-#: ../daemon/gvfsafpserver.c:1057 ../daemon/gvfsbackendftp.c:518
-#: ../daemon/gvfsbackendsftp.c:984 ../daemon/gvfsbackendsmbbrowse.c:995
-#: ../daemon/gvfsbackendsmb.c:619
-msgid "Password dialog cancelled"
-msgstr "ààààààà àààà ààààà àààà àààà"
+#: ../daemon/gvfsafpserver.c:1105
+#| msgid "Password dialog cancelled"
+msgid "The password prompt was cancelled."
+msgstr "ààààààà àààààààà àààà àààà."
+
+#: ../daemon/gvfsafpserver.c:1222
+#| msgid "Failed to connect to server (%s)"
+msgid "Unable to disconnect from the server."
+msgstr "ààààààààà ààààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:1174
-#| msgid "Failed to retrieve share list from server"
-msgid "Failed to logout from server"
-msgstr "àààààààààààà ààààà ààààààà ààààà"
+#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1763
+msgid "Unable to connect to the server. A communication problem occurred."
+msgstr "ààààààààà ààààà ààààà. àààààà àààààààà àààà ààààà."
 
-#: ../daemon/gvfsafpserver.c:1663
-msgid "ID not found"
-msgstr "ID ààààà àààà"
+#: ../daemon/gvfsafpserver.c:1719
+#| msgid "Directory notification not supported"
+msgid "Identification not found."
+msgstr "ààààààààààà ààààà àààà."
 
 #: ../daemon/gvfsafputils.c:124
 #, c-format
@@ -368,19 +367,31 @@ msgstr "àààààààààààà ààààààà ààà à
 
 #: ../daemon/gvfsafpvolume.c:145
 #, c-format
-msgid "Couldn't mount AFP volume %s on %s"
-msgstr "AFP ààà %s ààààà àààà ààààà, %s àààà"
+#| msgid "Couldn't mount AFP volume %s on %s"
+msgid "Couldn't load %s on %s"
+msgstr "%2$s àààà %1$s ààà àààà ààààà"
+
+#: ../daemon/gvfsafpvolume.c:390 ../daemon/gvfsafpvolume.c:668
+#: ../daemon/gvfsafpvolume.c:821 ../daemon/gvfsafpvolume.c:1015
+#: ../daemon/gvfsafpvolume.c:1215 ../daemon/gvfsafpvolume.c:1398
+#: ../daemon/gvfsafpvolume.c:1555 ../daemon/gvfsafpvolume.c:2001
+#: ../daemon/gvfsafpvolume.c:2127 ../daemon/gvfsafpvolume.c:2289
+#: ../daemon/gvfsafpvolume.c:2509 ../daemon/gvfsbackendafc.c:286
+#: ../daemon/gvfsbackendsftp.c:307 ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "ààààààà ààààààà"
 
 #: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721
-#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:936
-#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:323
-#: ../daemon/gvfsbackendafpbrowse.c:355 ../daemon/gvfsbackendarchive.c:647
-#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:993
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
-#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
-#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
-#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
+#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:976
+#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:327
+#: ../daemon/gvfsbackendafpbrowse.c:359 ../daemon/gvfsbackendarchive.c:652
+#: ../daemon/gvfsbackendarchive.c:700 ../daemon/gvfsbackendarchive.c:752
+#: ../daemon/gvfsbackendarchive.c:781 ../daemon/gvfsbackendcdda.c:1012
+#: ../daemon/gvfsbackendcomputer.c:638 ../daemon/gvfsbackenddnssd.c:415
+#: ../daemon/gvfsbackendftp.c:1068 ../daemon/gvfsbackendnetwork.c:696
+#: ../daemon/gvfsbackendsmbbrowse.c:1100 ../daemon/gvfsbackendsmbbrowse.c:1167
+#: ../daemon/gvfsbackendsmbbrowse.c:1354 ../daemon/gvfsbackendsmbbrowse.c:1427
 #, c-format
 msgid "File doesn't exist"
 msgstr "àààà àààààààààà àààà"
@@ -388,9 +399,9 @@ msgstr "àààà àààààààààà àààà"
 #: ../daemon/gvfsafpvolume.c:398 ../daemon/gvfsafpvolume.c:468
 #: ../daemon/gvfsafpvolume.c:2517 ../daemon/gvfsbackendafp.c:277
 #: ../daemon/gvfsbackendafp.c:478 ../daemon/gvfsbackendafp.c:1310
-#: ../daemon/gvfsbackenddav.c:2241 ../daemon/gvfsbackendftp.c:773
-#: ../daemon/gvfsbackendsftp.c:2332 ../daemon/gvfsbackendsftp.c:3068
-#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsftp.c:4275
+#: ../daemon/gvfsbackenddav.c:2250 ../daemon/gvfsbackendftp.c:774
+#: ../daemon/gvfsbackendsftp.c:2339 ../daemon/gvfsbackendsftp.c:3055
+#: ../daemon/gvfsbackendsftp.c:3394 ../daemon/gvfsbackendsftp.c:4262
 msgid "File is directory"
 msgstr "àààà àààààà ààà"
 
@@ -399,12 +410,11 @@ msgid "Too many files open"
 msgstr "ààààààààà ààààà ààààààà àààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:672 ../daemon/gvfsafpvolume.c:829
-#| msgid "Target file exists"
 msgid "Target file is open"
 msgstr "àààààà àààà àààà ààà"
 
-#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:420
-#: ../daemon/gvfsbackenddav.c:2590 ../daemon/gvfsbackendsftp.c:1827
+#: ../daemon/gvfsafpvolume.c:676 ../daemon/gvfsbackendburn.c:421
+#: ../daemon/gvfsbackenddav.c:2599 ../daemon/gvfsbackendsftp.c:1821
 msgid "Directory not empty"
 msgstr "ààààààà àààààà àààà"
 
@@ -414,7 +424,6 @@ msgstr "àààààà àààààààààà àààà ààà
 
 #: ../daemon/gvfsafpvolume.c:684 ../daemon/gvfsafpvolume.c:1231
 #: ../daemon/gvfsafpvolume.c:2131
-#| msgid "File doesn't exist"
 msgid "Target object doesn't exist"
 msgstr "àààààà àààààààà àààààààààà àààà"
 
@@ -432,16 +441,15 @@ msgstr "àààààà àààààààà àààà ààààà
 
 #: ../daemon/gvfsafpvolume.c:833 ../daemon/gvfsafpvolume.c:1414
 #: ../daemon/gvfsafpvolume.c:1571 ../daemon/gvfsbackendafp.c:284
-#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2297
-#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackenddav.c:2661
-#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
-#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
-#: ../daemon/gvfsbackendsftp.c:4284 ../daemon/gvfsbackendsmb.c:2082
+#: ../daemon/gvfsbackendafp.c:485 ../daemon/gvfsbackenddav.c:2306
+#: ../daemon/gvfsbackenddav.c:2559 ../daemon/gvfsbackenddav.c:2670
+#: ../daemon/gvfsbackendftp.c:753 ../daemon/gvfsbackendftp.c:934
+#: ../daemon/gvfsbackendftp.c:1373 ../daemon/gvfsbackendftp.c:1553
+#: ../daemon/gvfsbackendsftp.c:4271 ../daemon/gvfsbackendsmb.c:2099
 msgid "Target file already exists"
 msgstr "àààààà àààà ààààààààà àààààààààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:837 ../daemon/gvfsafpvolume.c:1027
-#| msgid "File doesn't exist"
 msgid "Ancestor directory doesn't exist"
 msgstr "àààààààà àààààààààà àààààààààà àààà"
 
@@ -450,17 +458,14 @@ msgid "Volume is flat and doesn't support directories"
 msgstr "ààà ààààà ààà à àààààààààààààààà àààààà ààààà àààà"
 
 #: ../daemon/gvfsafpvolume.c:1031
-#| msgid "Target file already exists"
 msgid "Target directory already exists"
 msgstr "àààààà àààààààààà ààààààààà àààààààààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:1219 ../daemon/gvfsbackendafp.c:590
-#| msgid "Can't eject file"
 msgid "Can't rename volume"
 msgstr "ààààà àààààààààààà àààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1223
-#| msgid "Name already exists"
 msgid "Object with that name already exists"
 msgstr "àààààà àààààààà ààààààààà àààààààààà ààà"
 
@@ -470,17 +475,14 @@ msgstr ""
 "àààààà àààààààààà àààà ààààààààààààààà (RenameInhibit) àààààà ààààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1402
-#| msgid "Can't move directory over directory"
 msgid "Can't move directory into one of its descendants"
 msgstr "àààààààààààà ààààààààà ààààààààà ààààààà ààààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1406
-#| msgid "Can't move directory over directory"
 msgid "Can't move sharepoint into a shared directory"
 msgstr "ààààààààààà ààààààà ààààààààààààà ààààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1410
-#| msgid "Can't move directory over directory"
 msgid "Can't move a shared directory into the Trash"
 msgstr "ààààààà àààààààààààà ààààààààà àààààààààà àààà ààààà"
 
@@ -490,7 +492,6 @@ msgstr ""
 "ààààààààààà àààààààààà ààààààààààààààà (RenameInhibit) àààààà ààààà ààààà"
 
 #: ../daemon/gvfsafpvolume.c:1422
-#| msgid "File doesn't exist"
 msgid "Object being moved doesn't exist"
 msgstr "ààààààààààà àààààààà àààààààààà àààà"
 
@@ -507,7 +508,6 @@ msgid "Source file and/or destination directory doesn't exist"
 msgstr "ààààà àààà à/ààààà àààààà àààààààààà àààààààààà àààà"
 
 #: ../daemon/gvfsafpvolume.c:1579
-#| msgid "The file is not a directory"
 msgid "Source file is a directory"
 msgstr "ààààà àààà àààààààààà ààà"
 
@@ -516,12 +516,10 @@ msgid "Range lock conflict exists"
 msgstr "àààààààà àààààààà ààààà àààààààààà ààà"
 
 #: ../daemon/gvfsafpvolume.c:2293
-#| msgid "File doesn't exist"
 msgid "Directory doesn't exist"
 msgstr "àààààààààà àààààààààà àààà"
 
 #: ../daemon/gvfsafpvolume.c:2297
-#| msgid "Target %s is not a directory\n"
 msgid "Target object is not a directory"
 msgstr "àààààà àààààààà àààààààààà àààà"
 
@@ -541,27 +539,23 @@ msgstr "àààà ààààààààààà àààà àààà
 msgid "Internal Apple File Control error"
 msgstr "àààààà ààà àààà ààààààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:737
 msgid "File does not exist"
 msgstr "àààà àààààààààà àààà"
 
 #: ../daemon/gvfsbackendafc.c:217
-#| msgid "Directory not empty"
 msgid "The directory is not empty"
 msgstr "àààààààààà àààààà àààà"
 
 #: ../daemon/gvfsbackendafc.c:221
-#| msgid "The file is not a directory"
 msgid "The device did not respond"
 msgstr "àààà àààààààà ààà àààà"
 
 #: ../daemon/gvfsbackendafc.c:225
-#| msgid "The specified location is not supported"
 msgid "The connection was interrupted"
 msgstr "àààààààààà ààààààà"
 
 #: ../daemon/gvfsbackendafc.c:229
-#| msgid "Invalid reply received"
 msgid "Invalid Apple File Control data received"
 msgstr "àààà ààààààààà ààà àààà ààààààà àààà ààààààà"
 
@@ -583,60 +577,65 @@ msgid "Lockdown Error: Invalid Argument"
 msgstr "àààààààà àààààà: àààà ààà"
 
 #: ../daemon/gvfsbackendafc.c:290
+msgid "Unable to connect"
+msgstr "àààààà àààà ààààà"
+
+#: ../daemon/gvfsbackendafc.c:293
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "à ààààààààà àààààààà àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:307
+#: ../daemon/gvfsbackendafc.c:310
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice àààààà: àààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:311
+#: ../daemon/gvfsbackendafc.c:314
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
 msgstr ""
 "libimobiledevice àààààà: àààà ààààà àààà. usbmuxd ààààààààààà ààààà àààà ààà "
-"àààà àààààà ààà."
+"àààà "
+"àààààà ààà."
 
-#: ../daemon/gvfsbackendafc.c:315
+#: ../daemon/gvfsbackendafc.c:318
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "à ààààààààà libimobiledevice àààààà (%d)"
 
-#: ../daemon/gvfsbackendafc.c:390
+#: ../daemon/gvfsbackendafc.c:416
 msgid "Try again"
 msgstr "àààà ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:390 ../daemon/gvfsbackend.c:939
+#: ../daemon/gvfsbackendafc.c:416 ../daemon/gvfsbackend.c:968
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:736
 msgid "Cancel"
 msgstr "àààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:408 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1820
-#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
-#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
-#: ../daemon/gvfsbackendsmb.c:662
+#: ../daemon/gvfsbackendafc.c:434 ../daemon/gvfsbackendarchive.c:554
+#: ../daemon/gvfsbackendarchive.c:583 ../daemon/gvfsbackenddav.c:1828
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:885
+#: ../daemon/gvfsbackendobexftp.c:901 ../daemon/gvfsbackendobexftp.c:920
+#: ../daemon/gvfsbackendsmb.c:663
 msgid "Invalid mount spec"
 msgstr "àààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendafc.c:414 ../daemon/gvfsbackendafc.c:444
+#: ../daemon/gvfsbackendafc.c:440 ../daemon/gvfsbackendafc.c:470
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "àààà AFC ààààà: afc://uuid:port-number àààààààà àààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:430
+#: ../daemon/gvfsbackendafc.c:456
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "ààà àààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:461
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "ààà àààààà àààà, ààààààààà"
 
-#: ../daemon/gvfsbackendafc.c:440
+#: ../daemon/gvfsbackendafc.c:466
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "ààà àààààà àààààààà ààààààà"
@@ -644,7 +643,7 @@ msgstr "ààà àààààà àààààààà àààààà
 #. translators:
 #. * This is the device name, with the service being browsed in brackets, eg.:
 #. * Alan Smithee's iPhone (jailbreak)
-#: ../daemon/gvfsbackendafc.c:498
+#: ../daemon/gvfsbackendafc.c:525
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (àààààààà)"
@@ -652,145 +651,145 @@ msgstr "%s (àààààààà)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:505 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:532 ../monitor/afc/afcvolume.c:128
 #, 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:587
+#: ../daemon/gvfsbackendafc.c:627
 #, c-format
+#| msgid ""
+#| "The device '%s' is locked. Enter the passcode on the device and click "
+#| "'Try again'."
 msgid ""
-"The device '%s' is locked. Enter the passcode on the device and click 'Try "
-"again'."
+"The device â%sâ is locked. Enter the passcode on the device and click âTry "
+"againâ."
 msgstr ""
-"àààà '%s' àààààààà ààà. àààààààà àààààà àààà à 'àààà ààààààà ààà' ààààà ààà."
+"àààà â%sâ àààààààà ààà. àààààààà àààààà àààà à âàààà ààààààà àààâ ààààà ààà."
 
-#: ../daemon/gvfsbackendafc.c:926 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1810
-#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:718 ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:966 ../daemon/gvfsbackendarchive.c:660
+#: ../daemon/gvfsbackendcomputer.c:656 ../daemon/gvfsbackendgphoto2.c:1856
+#: ../daemon/gvfsbackendobexftp.c:1097 ../daemon/gvfsbackendrecent.c:121
+#: ../daemon/gvfsbackendsmb.c:719 ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "ààààààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:1127 ../daemon/gvfsbackendafc.c:2470
-#| msgid "backups not supported yet"
+#: ../daemon/gvfsbackendafc.c:1167 ../daemon/gvfsbackendafc.c:2531
 msgid "Backups are not yet supported."
 msgstr "àààààààà àààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:1299
-#| msgid "invalid type"
+#: ../daemon/gvfsbackendafc.c:1339
 msgid "Invalid seek type"
 msgstr "àààà ààà àààààà"
 
-#: ../daemon/gvfsbackendafc.c:2307 ../daemon/gvfsbackendafp.c:1749
-#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
-#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1831
-#: ../daemon/gvfsbackendsftp.c:4632 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsbackendafc.c:2368 ../daemon/gvfsbackendafp.c:1749
+#: ../daemon/gvfsbackendftp.c:1088 ../daemon/gvfsbackendftp.c:1136
+#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendsftp.c:1825
+#: ../daemon/gvfsbackendsftp.c:4619 ../daemon/gvfsbackendsmb.c:1736
 #: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "ààààààààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1089
-#: ../daemon/gvfsbackendsmbbrowse.c:1135
+#: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendsmbbrowse.c:1095
+#: ../daemon/gvfsbackendsmbbrowse.c:1141
 msgid "The file is not a mountable"
 msgstr "àààà ààààààààà àààà"
 
 #. Translators: first %s is username and second serververname
-#: ../daemon/gvfsbackendafpbrowse.c:452
+#. Translators: first %s is volumename and second servername
+#. Translators: the first %s is the username, the second the host name
+#. Translators: This is the name of an SFTP share, like "<user> on <hostname>"
+#. Set the mountspec according to original uri, no matter whether user changes
+#. credentials during mount loop. Nautilus and other gio clients depend
+#. on correct mountspec, setting it to real (different) credentials would
+#. lead to G_IO_ERROR_NOT_MOUNTED errors
+#.
+#. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
+#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2066
+#: ../daemon/gvfsbackendftp.c:634 ../daemon/gvfsbackendobexftp.c:705
+#: ../daemon/gvfsbackendsftp.c:1686 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
-#| msgid "sftp for %s on %s"
-msgid "AFP volumes for %s on %s"
-msgstr "%s ààààà %s àààà AFP ààà"
+msgid "%s on %s"
+msgstr "%s àà %s"
 
 #. Translators: %s is the servername
-#: ../daemon/gvfsbackendafpbrowse.c:456
+#: ../daemon/gvfsbackendafpbrowse.c:465
 #, c-format
-msgid "AFP volumes on %s"
-msgstr "%s àààà AFP ààà"
+msgid "%s"
+msgstr "%s"
 
-#: ../daemon/gvfsbackendafpbrowse.c:489 ../daemon/gvfsbackendafp.c:2097
-#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
-#: ../daemon/gvfsbackendsftp.c:1744
+#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2101
+#: ../daemon/gvfsbackendarchive.c:543 ../daemon/gvfsbackendftp.c:668
+#: ../daemon/gvfsbackendsftp.c:1738
 msgid "No hostname specified"
 msgstr "àààààààà ààààààà àààà àààà"
 
-#: ../daemon/gvfsbackendafpbrowse.c:559 ../daemon/gvfsbackendafp.c:2188
+#: ../daemon/gvfsbackendafpbrowse.c:568 ../daemon/gvfsbackendafp.c:2192
 msgid "Apple Filing Protocol Service"
 msgstr "ààà ààààààà ààààààààà àààààààà"
 
-#: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:871
-#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+#: ../daemon/gvfsbackendafp.c:274 ../daemon/gvfsbackendburn.c:875
+#: ../daemon/gvfsbackendftp.c:1545 ../daemon/gvfsbackendobexftp.c:1805
 msgid "Can't copy directory over directory"
 msgstr "ààààààààà ààààààààà àààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:887
-#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+#: ../daemon/gvfsbackendafp.c:293 ../daemon/gvfsbackendburn.c:891
+#: ../daemon/gvfsbackendftp.c:1568 ../daemon/gvfsbackendobexftp.c:1820
 msgid "Can't recursively copy directory"
 msgstr "ààààààààà àààà àààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4270
-#: ../daemon/gvfsbackendsmb.c:2071
+#: ../daemon/gvfsbackendafp.c:475 ../daemon/gvfsbackendsftp.c:4257
+#: ../daemon/gvfsbackendsmb.c:2088
 msgid "Can't move directory over directory"
 msgstr "ààààààààà ààààààà àààà ààà àààà"
 
 #: ../daemon/gvfsbackendafp.c:1229 ../daemon/gvfsbackendafp.c:1328
-#| msgid "backups not supported yet"
 msgid "backups not supported"
 msgstr "àààààààà ààààààà àààà"
 
 #: ../daemon/gvfsbackendafp.c:1243
 #, c-format
-#| msgid "Unable to create temporary file"
 msgid "Unable to create temporary file (%s)"
 msgstr "ààààààààà àààà (%s) ààààà ààààà"
 
-#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2370
-#: ../daemon/gvfsbackendsftp.c:3420 ../daemon/gvfsbackendsmb.c:1148
+#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2379
+#: ../daemon/gvfsbackendsftp.c:3407 ../daemon/gvfsbackendsmb.c:1149
 msgid "The file was externally modified"
 msgstr "àààà ààààà ààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1128
-#: ../daemon/gvfsbackendsftp.c:4642
-#| msgid "Invalid attribute type %s\n"
+#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1129
+#: ../daemon/gvfsbackendsftp.c:4629
 msgid "Invalid attribute type (uint32 expected)"
 msgstr "àààà ààààààà àààààà (uint32 àààààààà)"
 
 #. Translators: first %s is volumename, second username and third servername
-#: ../daemon/gvfsbackendafp.c:2058
-#, c-format
-#| msgid "sftp for %s on %s"
-msgid "AFP volume %s for %s on %s"
-msgstr "%2$s ààààà %3$s àààà AFP ààà %1$s"
-
-#. Translators: first %s is volumename and second servername
-#: ../daemon/gvfsbackendafp.c:2063
+#: ../daemon/gvfsbackendafp.c:2061
 #, c-format
-#| msgid "sftp for %s on %s"
-msgid "AFP volume %s on %s"
-msgstr "AFP ààà %s, %s àààà "
+#| msgid "SFTP for %s on %s"
+msgid "%s for %s on %s"
+msgstr "%3$s àààà %2$s ààààà %1$s"
 
-#: ../daemon/gvfsbackendafp.c:2106
-#| msgid "No drive specified"
+#: ../daemon/gvfsbackendafp.c:2110
 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:330 ../daemon/gvfsbackendsftp.c:2268
+#: ../daemon/gvfsbackendarchive.c:331 ../daemon/gvfsbackendsftp.c:2275
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ àààààààà %s"
 
-#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:675
-#: ../daemon/gvfsbackendcomputer.c:715 ../daemon/gvfsbackenddnssd.c:445
-#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
-#: ../daemon/gvfsbackendsftp.c:3880 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendarchive.c:790 ../daemon/gvfsbackendburn.c:679
+#: ../daemon/gvfsbackendcomputer.c:728 ../daemon/gvfsbackenddnssd.c:464
+#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:744
+#: ../daemon/gvfsbackendsftp.c:3867 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "àààà ààààààà àààà"
 
@@ -799,46 +798,46 @@ msgstr "àààà ààààààà àààà"
 msgid "Burn"
 msgstr "àààà"
 
-#: ../daemon/gvfsbackendburn.c:371
+#: ../daemon/gvfsbackendburn.c:372
 msgid "Unable to create temporary directory"
 msgstr "ààààààààà ààààààà ààààààààà ààààà"
 
-#: ../daemon/gvfsbackendburn.c:400 ../daemon/gvfsbackendburn.c:411
-#: ../daemon/gvfsbackendburn.c:446 ../daemon/gvfsbackendburn.c:667
-#: ../daemon/gvfsbackendburn.c:712 ../daemon/gvfsbackendburn.c:738
-#: ../daemon/gvfsbackendburn.c:776 ../daemon/gvfsbackendburn.c:967
-#: ../daemon/gvfsbackendburn.c:1003 ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1205 ../daemon/gvfsbackendgphoto2.c:2131
-#: ../daemon/gvfsbackendgphoto2.c:2854 ../daemon/gvfsbackendrecent.c:105
-#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1835
-#: ../daemon/gvfsbackendsftp.c:2948 ../daemon/gvfsbackendsftp.c:2961
-#: ../daemon/gvfsbackendsftp.c:2981 ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:401 ../daemon/gvfsbackendburn.c:412
+#: ../daemon/gvfsbackendburn.c:447 ../daemon/gvfsbackendburn.c:671
+#: ../daemon/gvfsbackendburn.c:716 ../daemon/gvfsbackendburn.c:742
+#: ../daemon/gvfsbackendburn.c:780 ../daemon/gvfsbackendburn.c:971
+#: ../daemon/gvfsbackendburn.c:1007 ../daemon/gvfsbackendftp.c:794
+#: ../daemon/gvfsbackendgphoto2.c:1238 ../daemon/gvfsbackendgphoto2.c:2177
+#: ../daemon/gvfsbackendgphoto2.c:2900 ../daemon/gvfsbackendrecent.c:105
+#: ../daemon/gvfsbackendrecent.c:259 ../daemon/gvfsbackendsftp.c:1829
+#: ../daemon/gvfsbackendsftp.c:2935 ../daemon/gvfsbackendsftp.c:2948
+#: ../daemon/gvfsbackendsftp.c:2968 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "àà àààààààà àààà ààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendburn.c:454 ../daemon/gvfsbackendburn.c:899
-#: ../daemon/gvfsbackendobexftp.c:1810
+#: ../daemon/gvfsbackendburn.c:455 ../daemon/gvfsbackendburn.c:903
+#: ../daemon/gvfsbackendobexftp.c:1836
 msgid "Can't copy file over directory"
 msgstr "ààààààààà àààààà àààà àààà àààà àààà"
 
 #. Translators: this is the display name of the backend
-#: ../daemon/gvfsbackendburn.c:646
+#: ../daemon/gvfsbackendburn.c:650
 msgid "CD/DVD Creator"
 msgstr "CD/DVD àààààààà"
 
-#: ../daemon/gvfsbackendburn.c:748 ../daemon/gvfsbackendburn.c:784
-#: ../daemon/gvfsbackendburn.c:919 ../daemon/gvfsbackendburn.c:981
-#: ../daemon/gvfsbackendburn.c:985 ../daemon/gvfsbackendburn.c:995
-#: ../daemon/gvfsbackendgphoto2.c:2928
+#: ../daemon/gvfsbackendburn.c:752 ../daemon/gvfsbackendburn.c:788
+#: ../daemon/gvfsbackendburn.c:923 ../daemon/gvfsbackendburn.c:985
+#: ../daemon/gvfsbackendburn.c:989 ../daemon/gvfsbackendburn.c:999
+#: ../daemon/gvfsbackendgphoto2.c:2974
 msgid "File exists"
 msgstr "àààà àààààà ààà"
 
-#: ../daemon/gvfsbackendburn.c:823 ../daemon/gvfsjobcloseread.c:112
+#: ../daemon/gvfsbackendburn.c:827 ../daemon/gvfsjobcloseread.c:112
 #: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:121
 #: ../daemon/gvfsjobcreatemonitor.c:143 ../daemon/gvfsjobcreatemonitor.c:154
 #: ../daemon/gvfsjobcreatemonitor.c:177 ../daemon/gvfsjobcreatemonitor.c:195
-#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:266
+#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:268
 #: ../daemon/gvfsjobmakedirectory.c:108 ../daemon/gvfsjobmount.c:112
 #: ../daemon/gvfsjobmountmountable.c:138 ../daemon/gvfsjobmove.c:121
 #: ../daemon/gvfsjobopenforread.c:120 ../daemon/gvfsjobopenforwrite.c:132
@@ -855,32 +854,32 @@ msgstr "àààà àààààà ààà"
 #: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
 #: ../monitor/gdu/ggdumount.c:1174 ../monitor/gdu/ggdumount.c:1258
 #: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1108
-#: ../monitor/udisks2/gvfsudisks2volume.c:1556
+#: ../monitor/udisks2/gvfsudisks2volume.c:1566
 msgid "Operation not supported by backend"
 msgstr "àààààà àààààà ààààààààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendburn.c:848
+#: ../daemon/gvfsbackendburn.c:852
 msgid "No such file or directory in target path"
 msgstr "àààà ààààààà àààà ààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendburn.c:880 ../daemon/gvfsbackendobexftp.c:1787
-#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1829
-#: ../daemon/gvfsbackendsftp.c:4440
+#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackendobexftp.c:1813
+#: ../daemon/gvfsbackendobexftp.c:1844 ../daemon/gvfsbackendsftp.c:1823
+#: ../daemon/gvfsbackendsftp.c:4427
 msgid "Target file exists"
 msgstr "àààààà àààà àààààààààà ààà"
 
-#: ../daemon/gvfsbackendburn.c:945 ../daemon/gvfsbackendcomputer.c:795
-#: ../daemon/gvfsbackendgphoto2.c:2504 ../daemon/gvfsbackendgphoto2.c:2717
-#: ../daemon/gvfsbackendgphoto2.c:2814 ../daemon/gvfsbackendgphoto2.c:2907
+#: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:811
+#: ../daemon/gvfsbackendgphoto2.c:2550 ../daemon/gvfsbackendgphoto2.c:2763
+#: ../daemon/gvfsbackendgphoto2.c:2860 ../daemon/gvfsbackendgphoto2.c:2953
 msgid "Not supported"
 msgstr "ààààààà àààà"
 
-#: ../daemon/gvfsbackend.c:938 ../monitor/gdu/ggdumount.c:922
+#: ../daemon/gvfsbackend.c:967 ../monitor/gdu/ggdumount.c:922
 #: ../monitor/udisks2/gvfsudisks2mount.c:734
 msgid "Unmount Anyway"
 msgstr "ààààà àààà ààààà ààààà ààà"
 
-#: ../daemon/gvfsbackend.c:941 ../monitor/gdu/ggdumount.c:924
+#: ../daemon/gvfsbackend.c:970 ../monitor/gdu/ggdumount.c:924
 #: ../monitor/udisks2/gvfsudisks2mount.c:737
 msgid ""
 "Volume is busy\n"
@@ -889,44 +888,44 @@ msgstr ""
 "ààà àààààà ààà\n"
 "àà ààààà àààààààààà ààààà àààààààààààà àààààà àààààà àààà ààà."
 
-#: ../daemon/gvfsbackendcdda.c:336 ../daemon/gvfsbackendgphoto2.c:1508
+#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1548
 msgid "Cannot create gudev client"
 msgstr "gudev ààààààà ààààààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1566
 msgid "Cannot connect to the system bus"
 msgstr "ààààààà àààà àààààà ààààààà àààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:367 ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1578
 msgid "Cannot create libhal context"
 msgstr "libhal àààààà àààààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:381 ../daemon/gvfsbackendgphoto2.c:1551
+#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1591
 msgid "Cannot initialize libhal"
 msgstr "libhal ààààààà àààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:397 ../daemon/gvfsbackendcdda.c:482
+#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:501
 msgid "No drive specified"
 msgstr "àààààààà ààààààààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:421
+#: ../daemon/gvfsbackendcdda.c:439
 #, c-format
 msgid "Cannot find drive %s"
 msgstr "àààààààà %s àààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:434
+#: ../daemon/gvfsbackendcdda.c:452
 #, c-format
 msgid "Drive %s does not contain audio files"
 msgstr "àààààààà %s ààààà àààà àààà àààààààà àààà"
 
 #. Translator: %s is the device the disc is inserted into. 'cdda' is the name
 #. name of the backend and shouldn't be translated.
-#: ../daemon/gvfsbackendcdda.c:444
+#: ../daemon/gvfsbackendcdda.c:462
 #, c-format
 msgid "cdda mount on %s"
 msgstr "%s àà cdda ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:445 ../daemon/gvfsbackendcdda.c:965
+#: ../daemon/gvfsbackendcdda.c:463 ../daemon/gvfsbackendcdda.c:984
 #: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #: ../monitor/udisks2/gvfsudisks2volume.c:308
@@ -934,94 +933,93 @@ msgstr "%s àà cdda ààààà"
 msgid "Audio Disc"
 msgstr "ààààààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:508
+#: ../daemon/gvfsbackendcdda.c:527
 #, 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 àààà ààààà"
 
-#: ../daemon/gvfsbackendcdda.c:700
+#: ../daemon/gvfsbackendcdda.c:719
 #, 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:809
+#: ../daemon/gvfsbackendcdda.c:828
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "àààààààà %s àààà 'paranoia' ààààà àààààà"
 
-#: ../daemon/gvfsbackendcdda.c:872
+#: ../daemon/gvfsbackendcdda.c:891
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "àààààààà %s àààà ààààààà ààààààààà àààààà"
 
-#: ../daemon/gvfsbackendcdda.c:986 ../daemon/gvfsbackendgphoto2.c:1818
+#: ../daemon/gvfsbackendcdda.c:1005 ../daemon/gvfsbackendgphoto2.c:1864
 #, c-format
 msgid "No such file"
 msgstr "àà àààààààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:1000
+#: ../daemon/gvfsbackendcdda.c:1019
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "àààà àà àààààààààà àààà ààààà àà ààààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:1106
-#| msgid "Audio CD Filesystem Service"
+#: ../daemon/gvfsbackendcdda.c:1125
 msgid "Audio CD File System Service"
 msgstr "àààà CD àààà àààààà àààààààà"
 
-#: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:757
+#: ../daemon/gvfsbackendcomputer.c:198 ../daemon/gvfsbackendcomputer.c:770
 msgid "Computer"
 msgstr "ààààà"
 
-#: ../daemon/gvfsbackendcomputer.c:521
-#| msgid "Filesystem"
+#: ../daemon/gvfsbackendcomputer.c:531
 msgid "File System"
 msgstr "àààà ààààààà"
 
-#: ../daemon/gvfsbackendcomputer.c:649
+#: ../daemon/gvfsbackendcomputer.c:660
 msgid "Can't open mountable file"
 msgstr "ààààà àààà àààà àààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:841 ../daemon/gvfsbackendsftp.c:1162
+#: ../daemon/gvfsbackendcomputer.c:857 ../daemon/gvfsbackendsftp.c:1158
 #, c-format
 msgid "Internal error: %s"
 msgstr "àààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:873 ../daemon/gvfsbackendcomputer.c:992
+#: ../daemon/gvfsbackendcomputer.c:889 ../daemon/gvfsbackendcomputer.c:1008
 msgid "Can't mount file"
 msgstr "àààà ààààà àààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:885
-#| msgid "No media in the drive"
+#: ../daemon/gvfsbackendcomputer.c:901
 msgid "No medium in the drive"
 msgstr "ààààààààààààà àààààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:942 ../daemon/gvfsbackendcomputer.c:1037
-#: ../daemon/gvfsbackendcomputer.c:1143 ../daemon/gvfsbackendcomputer.c:1233
-#: ../daemon/gvfsbackendcomputer.c:1306 ../daemon/gvfsbackendcomputer.c:1375
+#: ../daemon/gvfsbackendcomputer.c:958 ../daemon/gvfsbackendcomputer.c:1053
+#: ../daemon/gvfsbackendcomputer.c:1159 ../daemon/gvfsbackendcomputer.c:1249
+#: ../daemon/gvfsbackendcomputer.c:1322 ../daemon/gvfsbackendcomputer.c:1391
 msgid "Not a mountable file"
 msgstr "ààààààààà àààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1056
+#: ../daemon/gvfsbackendcomputer.c:1072
 msgid "Can't unmount file"
 msgstr "àààà àààààààà ààà ààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1186
+#: ../daemon/gvfsbackendcomputer.c:1202
 msgid "Can't eject file"
 msgstr "àààà ààààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1253 ../daemon/gvfsbackendcomputer.c:1260
-msgid "Can't start file"
-msgstr "àààà àààà ààààààà ààààà"
+#: ../daemon/gvfsbackendcomputer.c:1269 ../daemon/gvfsbackendcomputer.c:1276
+#| msgid "Can't start file"
+msgid "Can't start drive"
+msgstr "àààààààà àààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1326 ../daemon/gvfsbackendcomputer.c:1333
-msgid "Can't stop file"
-msgstr "àààà àààààààààà ààààà"
+#: ../daemon/gvfsbackendcomputer.c:1342 ../daemon/gvfsbackendcomputer.c:1349
+#| msgid "Can't stop file"
+msgid "Can't stop drive"
+msgstr "àààààààà àààààààààà ààààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1390 ../daemon/gvfsbackendcomputer.c:1397
+#: ../daemon/gvfsbackendcomputer.c:1406 ../daemon/gvfsbackendcomputer.c:1413
 msgid "Can't poll file"
 msgstr "àààà ààà ààààààà ààààà"
 
@@ -1030,153 +1028,131 @@ msgstr "àààà ààà ààààààà ààààà"
 #. the second %s and only shown if it is not the default http(s) port.
 #: ../daemon/gvfsbackenddav.c:485
 #, c-format
-#| msgid "WebDAV on %s"
-msgid "WebDAV as %s on %s%s"
-msgstr "%s àààààà %s%s àààà WebDAV"
+#| msgid "%s on %s"
+msgid "%s on %s%s"
+msgstr "%s, %s%s àààà"
 
-#. Translators: This is the name of the WebDAV share constructed as
-#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
-#. %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"
-msgid "WebDAV on %s%s"
-msgstr "%s%s àààà WebDAV"
-
-#: ../daemon/gvfsbackenddav.c:680 ../daemon/gvfsbackenddav.c:1910
+#: ../daemon/gvfsbackenddav.c:677 ../daemon/gvfsbackenddav.c:1918
 #: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP àààààà: %s"
 
-#: ../daemon/gvfsbackenddav.c:697
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Could not parse response"
 msgstr "àààààààà àààà àààà àààà"
 
-#: ../daemon/gvfsbackenddav.c:706
+#: ../daemon/gvfsbackenddav.c:703
 msgid "Empty response"
 msgstr "àààààààà àààààà ààà"
 
-#: ../daemon/gvfsbackenddav.c:714
+#: ../daemon/gvfsbackenddav.c:711
 msgid "Unexpected reply from server"
 msgstr "ààààà ààààà ààààààààà àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1394 ../daemon/gvfsbackenddav.c:2039
-#: ../daemon/gvfsbackenddav.c:2126 ../daemon/gvfsbackenddav.c:2233
+#: ../daemon/gvfsbackenddav.c:1402 ../daemon/gvfsbackenddav.c:2048
+#: ../daemon/gvfsbackenddav.c:2135 ../daemon/gvfsbackenddav.c:2242
 msgid "Response invalid"
 msgstr "àààà àààààààà"
 
-#: ../daemon/gvfsbackenddav.c:1537
+#: ../daemon/gvfsbackenddav.c:1545
 msgid "WebDAV share"
 msgstr "WebDAV àààà"
 
-#: ../daemon/gvfsbackenddav.c:1539
+#. translators: %s here is the hostname
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackenddav.c:1547 ../daemon/gvfsbackendftp.c:491
+#: ../daemon/gvfsbackendsftp.c:964
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s ààààà ààààààà àààà àààààààà ààà"
 
-#: ../daemon/gvfsbackenddav.c:1542
+#: ../daemon/gvfsbackenddav.c:1550
 msgid "Please enter proxy password"
 msgstr "ààààà àààààààà ààààààà àààà àààààààà ààà"
 
-#: ../daemon/gvfsbackenddav.c:1914 ../daemon/gvfsbackenddav.c:1918
+#: ../daemon/gvfsbackenddav.c:1922 ../daemon/gvfsbackenddav.c:1926
 msgid "Not a WebDAV enabled share"
 msgstr "WebDAV ààààààààààà àààà àààà"
 
-#: ../daemon/gvfsbackenddav.c:1993 ../daemon/gvfsbackenddav.c:2081
-#: ../daemon/gvfsbackenddav.c:2154 ../daemon/gvfsbackenddav.c:2267
+#: ../daemon/gvfsbackenddav.c:2002 ../daemon/gvfsbackenddav.c:2090
+#: ../daemon/gvfsbackenddav.c:2163 ../daemon/gvfsbackenddav.c:2276
 msgid "Could not create request"
 msgstr "àààààà àààà àààà àààà"
 
-#: ../daemon/gvfsbackenddav.c:2401 ../daemon/gvfsbackendsmb.c:1184
-#: ../daemon/gvfsbackendsmb.c:2099
+#: ../daemon/gvfsbackenddav.c:2410 ../daemon/gvfsbackendsmb.c:1185
+#: ../daemon/gvfsbackendsmb.c:2116
 msgid "Backup file creation failed"
 msgstr "àààààààà àààà ààààààà ààààà"
 
-#. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:511 ../daemon/gvfsbackendnetwork.c:462
 msgid "Local Network"
 msgstr "ààààààà ààààààà"
 
-#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
+#: ../daemon/gvfsbackenddnssd.c:758 ../daemon/gvfsbackendnetwork.c:851
 msgid "Can't monitor file or directory."
 msgstr "àààà ààààà ààààààààà àààààààà àààà."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:754
+#: ../daemon/gvfsbackenddnssd.c:776
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
-#: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
+#: ../daemon/gvfsbackenddnssd.c:777 ../daemon/gvfsbackendnetwork.c:783
+#: ../daemon/gvfsbackendnetwork.c:918 ../daemon/gvfsbackendnetwork.c:919
 msgid "Network"
 msgstr "ààààààà"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:488
-#, c-format
-#| 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:491
+#: ../daemon/gvfsbackendftp.c:488 ../daemon/gvfsbackendsftp.c:957
 #, c-format
-#| msgid "Enter password for ftp on %s"
-msgid "Enter password for FTP on %s"
-msgstr "%s àààà FTP ààààà ààààààà àààà"
+#| msgid "Enter password for ssh on %s"
+msgid "Enter password for %s on %s"
+msgstr "%2$s àààà %1$s ààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendftp.c:630
-#, c-format
-#| 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:634
-#, c-format
-#| msgid "ftp as %s on %s"
-msgid "FTP as %s on %s"
-msgstr "%s ààààà %s àààà FTP"
+#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:981
+#: ../daemon/gvfsbackendsmbbrowse.c:1001 ../daemon/gvfsbackendsmb.c:620
+msgid "Password dialog cancelled"
+msgstr "ààààààà àààà ààààà àààà àààà"
 
-#: ../daemon/gvfsbackendftp.c:727
+#: ../daemon/gvfsbackendftp.c:728
 msgid "Insufficient permissions"
 msgstr "ààààà ààààààà"
 
-#: ../daemon/gvfsbackendftp.c:981 ../daemon/gvfsbackendftp.c:1335
-#: ../daemon/gvfsbackendsftp.c:3273
+#: ../daemon/gvfsbackendftp.c:982 ../daemon/gvfsbackendftp.c:1336
+#: ../daemon/gvfsbackendsftp.c:3260
 msgid "backups not supported yet"
 msgstr "àààààà àààààà ààààààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:506
+#: ../daemon/gvfsbackendgphoto2.c:507
 #, c-format
 msgid "%s: %d: Directory or file exists"
 msgstr "%s: %d: àààààààààà ààààà àààà àààààààààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:513
+#: ../daemon/gvfsbackendgphoto2.c:514
 #, c-format
 msgid "%s: %d: No such file or directory"
 msgstr "%s: %d: ààààààà àààà ààààà àààààààààà ààààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:519
+#: ../daemon/gvfsbackendgphoto2.c:520
 #, c-format
 msgid "%s: %d: Invalid filename"
 msgstr "%s: %d: àààà ààààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:525
+#: ../daemon/gvfsbackendgphoto2.c:526
 #, c-format
 msgid "%s: %d: Not Supported"
 msgstr "%s: %d: ààààààà àààà"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:718 ../daemon/gvfsbackendgphoto2.c:724
+#: ../daemon/gvfsbackendgphoto2.c:738 ../daemon/gvfsbackendgphoto2.c:744
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "àààààà àààààà (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:947 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:972 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1184,173 +1160,169 @@ msgstr "%s àààààà"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:950 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:975 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s àààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:984 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:986 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "àààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1567
+#: ../daemon/gvfsbackendgphoto2.c:1607
 msgid "No device specified"
 msgstr "àààà ààààààà àààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1588
+#: ../daemon/gvfsbackendgphoto2.c:1628
 msgid "Cannot create gphoto2 context"
 msgstr "gphoto2 àààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1598
+#: ../daemon/gvfsbackendgphoto2.c:1638
 msgid "Error creating camera"
 msgstr "àààààà àààààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611 ../daemon/gvfsbackendgphoto2.c:1621
+#: ../daemon/gvfsbackendgphoto2.c:1651 ../daemon/gvfsbackendgphoto2.c:1661
 msgid "Error loading device information"
 msgstr "àààà ààààà àààààà àààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1633
+#: ../daemon/gvfsbackendgphoto2.c:1673
 msgid "Error looking up device information"
 msgstr "àààà ààààà àààààà ààààà ààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1643
+#: ../daemon/gvfsbackendgphoto2.c:1683
 msgid "Error getting device information"
 msgstr "àààà ààààà àààààà ààààààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1698
 msgid "Error setting up camera communications port"
 msgstr "àààààà àààààà ààààààà àààààà ààààààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1709
 msgid "Error initializing camera"
 msgstr "àààààà ààààààà àààààààà àààààà ààààà"
 
 #. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
 #. backend and shouldn't be translated.
-#: ../daemon/gvfsbackendgphoto2.c:1684
+#: ../daemon/gvfsbackendgphoto2.c:1724
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "%s àà gphoto2 àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1764
+#: ../daemon/gvfsbackendgphoto2.c:1810
 msgid "No camera specified"
 msgstr "àààààà ààààààà àààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1826
+#: ../daemon/gvfsbackendgphoto2.c:1872
 msgid "Error creating file object"
 msgstr "àààà ààààààà ààààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1841
+#: ../daemon/gvfsbackendgphoto2.c:1887
 msgid "Error getting file"
 msgstr "àààà ààààààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1851
+#: ../daemon/gvfsbackendgphoto2.c:1897
 msgid "Error getting data from file"
 msgstr "àààà ààààà àààà ààààààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:1909
+#: ../daemon/gvfsbackendgphoto2.c:1955
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "àààààà ààààà àààààààà '%s'"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985 ../daemon/gvfsbackendgphoto2.c:3178
+#: ../daemon/gvfsbackendgphoto2.c:2031 ../daemon/gvfsbackendgphoto2.c:3224
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "àààààà %s àààà ààààààà ààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2125 ../daemon/gvfsbackendsftp.c:2951
-#: ../daemon/gvfsbackendsmbbrowse.c:1399
+#: ../daemon/gvfsbackendgphoto2.c:2171 ../daemon/gvfsbackendsftp.c:2938
+#: ../daemon/gvfsbackendsmbbrowse.c:1423
 msgid "Not a directory"
 msgstr "ààààààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2158
+#: ../daemon/gvfsbackendgphoto2.c:2204
 msgid "Failed to get folder list"
 msgstr "àààààà àààà ààààààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2224
+#: ../daemon/gvfsbackendgphoto2.c:2270
 msgid "Failed to get file list"
 msgstr "àààà àààà ààààààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2516
+#: ../daemon/gvfsbackendgphoto2.c:2562
 msgid "Error creating directory"
 msgstr "àààààààààà àààààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2729
+#: ../daemon/gvfsbackendgphoto2.c:2775
 msgid "Name already exists"
 msgstr "ààà ààààààààà àààààààààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2740 ../daemon/gvfsbackendgphoto2.c:3373
+#: ../daemon/gvfsbackendgphoto2.c:2786 ../daemon/gvfsbackendgphoto2.c:3419
 msgid "New name too long"
 msgstr "àààà ààààààà ààà àààà ààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2750 ../daemon/gvfsbackendgphoto2.c:3384
-#| msgid "Error creating directory"
+#: ../daemon/gvfsbackendgphoto2.c:2796 ../daemon/gvfsbackendgphoto2.c:3430
 msgid "Error renaming directory"
 msgstr "àààààààààà ààààààààààààààààààà àààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2763 ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:2809 ../daemon/gvfsbackendgphoto2.c:3443
 msgid "Error renaming file"
 msgstr "àààà àààààààààààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2827
+#: ../daemon/gvfsbackendgphoto2.c:2873
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "àààààààààà '%s' àààààà àààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2838
+#: ../daemon/gvfsbackendgphoto2.c:2884
 msgid "Error deleting directory"
 msgstr "àààààààààà àààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2864
+#: ../daemon/gvfsbackendgphoto2.c:2910
 msgid "Error deleting file"
 msgstr "àààà àààà àààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2917
+#: ../daemon/gvfsbackendgphoto2.c:2963
 msgid "Can't write to directory"
 msgstr "àààààààààà ààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2964
+#: ../daemon/gvfsbackendgphoto2.c:3010
 msgid "Cannot allocate new file to append to"
 msgstr "àààààà àààààààààà àààà àààààà àààà àààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:3025
 msgid "Cannot read file to append to"
 msgstr "àààààà àààààààààà àààà ààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:2990
+#: ../daemon/gvfsbackendgphoto2.c:3036
 msgid "Cannot get data of file to append to"
 msgstr "àààààà àààààààààà àààà ààààààà àààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3281
+#: ../daemon/gvfsbackendgphoto2.c:3327
 msgid "Error writing file"
 msgstr "àààà àààààààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendgphoto2.c:3329
+#: ../daemon/gvfsbackendgphoto2.c:3375
 msgid "Not supported (not same directory)"
 msgstr "ààààààà àààà (àààà àààààààààà àààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3341
-#| msgid "Not supported (src is dir, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3387
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "ààààààà àààà (ààààà àààààààààà ààà, àààààà ààààà àààààààààà ààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
-#| msgid "Not supported (src is dir, dst is existing file)"
+#: ../daemon/gvfsbackendgphoto2.c:3395
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
 msgstr ""
 "ààààààà àààà (ààààà àààààààààà ààà, ààààà àààààà àààààààààààà àààà ààà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3361
-#| msgid "Not supported (src is file, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3407
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "ààààààà àààà (ààààà àààààààààà ààà, ààààà àààààà àààààààààà ààà)"
@@ -1360,220 +1332,187 @@ msgstr "ààààààà àààà (ààààà àààààà
 msgid "HTTP Client Error: %s"
 msgstr "HTTP ààààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendlocaltest.c:855
+#: ../daemon/gvfsbackendlocaltest.c:856
 msgid "Directory notification not supported"
 msgstr "ààààààà ààààà ààààààà àààà"
 
-#. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
+#: ../daemon/gvfsbackendnetwork.c:168
+msgid "File Sharing"
+msgstr "àààà ààààààà"
+
+#: ../daemon/gvfsbackendnetwork.c:173
+msgid "Remote Login"
+msgstr "àààààà àààààà"
+
+#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:896
 msgid "Windows Network"
 msgstr "Windows ààààààà"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:873
+#: ../daemon/gvfsbackendnetwork.c:976
 msgid "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
-#. on correct mountspec, setting it to real (different) credentials would
-#. lead to G_IO_ERROR_NOT_MOUNTED errors
-#.
-#. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
-#: ../daemon/gvfsbackendsmb.c:1433
-#, c-format
-msgid "%s on %s"
-msgstr "%s àà %s"
-
-#: ../daemon/gvfsbackendobexftp.c:891
+#: ../daemon/gvfsbackendobexftp.c:914
 msgid "USB support missing. Please contact your software vendor"
 msgstr "USB àààààà ààààà àààà. ààààà ààààààà ààààààààà àààààààààà àààààà ààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1010
+#: ../daemon/gvfsbackendobexftp.c:1036
 msgid "Connection to the device lost"
 msgstr "àààààà àààààà ààààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1507
+#: ../daemon/gvfsbackendobexftp.c:1533
 msgid "Device requires a software update"
 msgstr "ààààààà ààààààààà àààààààààà àààààààà ààà"
 
-#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
+#: ../daemon/gvfsbackendobexftp.c:1881 ../daemon/gvfsbackendsmb.c:1990
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "àààà ààààà ààààààààà àààààà: %s"
 
 #: ../daemon/gvfsbackendrecent.c:238
-#| msgid "The trash folder may not be deleted"
 msgid "The recent folder may not be deleted"
 msgstr "àààààà àààààà àààà àààà ààààà"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendrecent.c:547 ../daemon/gvfsbackendrecent.c:658
+#: ../daemon/gvfsbackendrecent.c:548 ../daemon/gvfsbackendrecent.c:662
 msgid "Recent"
 msgstr "àààààà"
 
-#: ../daemon/gvfsbackendsftp.c:303 ../daemon/gvfsbackendsftp.c:657
+#: ../daemon/gvfsbackendsftp.c:299 ../daemon/gvfsbackendsftp.c:654
 msgid "ssh program unexpectedly exited"
 msgstr "ssh ààààààààà ààààààààààààààà àààààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:318
+#: ../daemon/gvfsbackendsftp.c:314
 msgid "Hostname not known"
 msgstr "àààààààà àààààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:325
+#: ../daemon/gvfsbackendsftp.c:321
 msgid "No route to host"
 msgstr "ààààà ààààà ààààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:332
+#: ../daemon/gvfsbackendsftp.c:328
 msgid "Connection refused by server"
 msgstr "ààààà àààààà àààààààà àààààà"
 
-#: ../daemon/gvfsbackendsftp.c:339
+#: ../daemon/gvfsbackendsftp.c:335
 msgid "Host key verification failed"
 msgstr "ààààà àààààà àààà ààààà"
 
-#: ../daemon/gvfsbackendsftp.c:501
+#: ../daemon/gvfsbackendsftp.c:498
 msgid "Unable to spawn ssh program"
 msgstr "ssh àààààààààà ààààààààààà ààààà"
 
-#: ../daemon/gvfsbackendsftp.c:517
+#: ../daemon/gvfsbackendsftp.c:514
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "ssh àààààààààà ààààààààààà ààààà: %s"
 
-#: ../daemon/gvfsbackendsftp.c:619 ../daemon/gvfsbackendsftp.c:877
+#: ../daemon/gvfsbackendsftp.c:616 ../daemon/gvfsbackendsftp.c:874
 msgid "Timed out when logging in"
 msgstr "ààààà àààààààà àààààààààà"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:957
+#: ../daemon/gvfsbackendsftp.c:954
 #, c-format
-#| msgid "Enter password for ftp as %s on %s"
-msgid "Enter passphrase for key for ssh as %s on %s"
-msgstr "%s àààààà %s àààà ssh ààààà àààààà àààààààà àààà"
-
-#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:960
-#, c-format
-#| msgid "Enter password for ftp as %s on %s"
-msgid "Enter password for ssh as %s on %s"
-msgstr "%s àààààà %s ààààà ssh ààààà ààààààà àààà"
+#| msgid "Enter passphrase for key for ssh on %s"
+msgid "Enter passphrase for secure key for %s on %s"
+msgstr "%2$s àààà %1$s àààà ààààààà ààààààà àààààààà àààà"
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:964
+#: ../daemon/gvfsbackendsftp.c:961
 #, c-format
-#| msgid "Enter passphrase for key"
-msgid "Enter passphrase for key for ssh on %s"
-msgstr "%s àààà ssh ààààà àààààà àààààààà àààà"
+#| msgid "Enter passphrase for key for ssh on %s"
+msgid "Enter passphrase for secure key for %s"
+msgstr "%s ààààà ààààààà àààààà àààààààà àààà"
 
-#. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:967
-#, c-format
-#| msgid "Enter password for ftp on %s"
-msgid "Enter password for ssh on %s"
-msgstr "%s ààààà ssh ààààà ààààààà àààà"
-
-#: ../daemon/gvfsbackendsftp.c:1047
+#: ../daemon/gvfsbackendsftp.c:1044
 msgid "Can't send password"
 msgstr "ààààààà àààà ààààà àààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1052
 msgid "Log In Anyway"
 msgstr "ààààà àààà àààà ààà"
 
-#: ../daemon/gvfsbackendsftp.c:1055
+#: ../daemon/gvfsbackendsftp.c:1052
 msgid "Cancel Login"
 msgstr "ààààà àààà ààà"
 
-#: ../daemon/gvfsbackendsftp.c:1064
+#: ../daemon/gvfsbackendsftp.c:1061
 #, c-format
+#| msgid ""
+#| "The identity of the remote computer (%s) is unknown.\n"
+#| "This happens when you log in to a computer the first time.\n"
+#| "\n"
+#| "The identity sent by the remote computer is %s. If you want to be "
+#| "absolutely sure it is safe to continue, contact the system administrator."
 msgid ""
-"The identity of the remote computer (%s) is unknown.\n"
+"Can't verify the identity of â%sâ.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely "
-"sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is â%sâ. If you want to be "
+"absolutely sure it is safe to continue, contact the system administrator."
 msgstr ""
-"àààààà àààààààà ààà (%s) ààààààà ààà.\n"
+"àààààà àààààààà ààà â%sâààààààà ààà.\n"
 "àà àààààà àààà àààààà àààààà àààààààà ààààà àààà.\n"
 "\n"
-"àààààà àààààààà ààààààààà ààà %s ààà. àààà àààà àààààààà ààà àà ààààààà "
+"àààààà àààààààà ààààààààà ààà â%sâ ààà. àààà àààà àààààààà ààà àà ààààààà "
 "ààààààààààà, ààààààà "
 "àààààààààà àààààà ààà."
 
-#: ../daemon/gvfsbackendsftp.c:1084
+#: ../daemon/gvfsbackendsftp.c:1080
 msgid "Login dialog cancelled"
 msgstr "ààààà ààààà àààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:1104
+#: ../daemon/gvfsbackendsftp.c:1100
 msgid "Can't send host identity confirmation"
 msgstr "ààààà ààà ààààààààà ààààà ààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:1642 ../daemon/gvfsbackendsftp.c:1665
+#: ../daemon/gvfsbackendsftp.c:1638 ../daemon/gvfsbackendsftp.c:1661
 msgid "Protocol error"
 msgstr "ààààààààà àààààà"
 
-#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1690
-#, c-format
-#| 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>"
-#: ../daemon/gvfsbackendsftp.c:1693
-#, c-format
-#| msgid "/ on %s"
-msgid "SFTP on %s"
-msgstr "%s àààà SFTP"
-
-#: ../daemon/gvfsbackendsftp.c:1734
+#: ../daemon/gvfsbackendsftp.c:1728
 msgid "Unable to find supported ssh command"
 msgstr "ààààààà ssh àààà àààààààà ààààà"
 
-#: ../daemon/gvfsbackendsftp.c:2008 ../daemon/gvfsbackendsftp.c:2397
-#: ../daemon/gvfsbackendsftp.c:2476 ../daemon/gvfsbackendsftp.c:2487
-#: ../daemon/gvfsbackendsftp.c:2543 ../daemon/gvfsbackendsftp.c:2629
-#: ../daemon/gvfsbackendsftp.c:2679 ../daemon/gvfsbackendsftp.c:2725
-#: ../daemon/gvfsbackendsftp.c:2800 ../daemon/gvfsbackendsftp.c:2907
-#: ../daemon/gvfsbackendsftp.c:3024 ../daemon/gvfsbackendsftp.c:3105
-#: ../daemon/gvfsbackendsftp.c:3177 ../daemon/gvfsbackendsftp.c:3189
-#: ../daemon/gvfsbackendsftp.c:3245 ../daemon/gvfsbackendsftp.c:3287
-#: ../daemon/gvfsbackendsftp.c:3472 ../daemon/gvfsbackendsftp.c:3504
-#: ../daemon/gvfsbackendsftp.c:3559 ../daemon/gvfsbackendsftp.c:3616
-#: ../daemon/gvfsbackendsftp.c:3913 ../daemon/gvfsbackendsftp.c:3980
-#: ../daemon/gvfsbackendsftp.c:4113 ../daemon/gvfsbackendsftp.c:4173
-#: ../daemon/gvfsbackendsftp.c:4208 ../daemon/gvfsbackendsftp.c:4236
-#: ../daemon/gvfsbackendsftp.c:4344 ../daemon/gvfsbackendsftp.c:4398
-#: ../daemon/gvfsbackendsftp.c:4437 ../daemon/gvfsbackendsftp.c:4471
-#: ../daemon/gvfsbackendsftp.c:4505 ../daemon/gvfsbackendsftp.c:4520
-#: ../daemon/gvfsbackendsftp.c:4535 ../daemon/gvfsbackendsftp.c:4613
+#: ../daemon/gvfsbackendsftp.c:2002 ../daemon/gvfsbackendsftp.c:2404
+#: ../daemon/gvfsbackendsftp.c:2463 ../daemon/gvfsbackendsftp.c:2474
+#: ../daemon/gvfsbackendsftp.c:2530 ../daemon/gvfsbackendsftp.c:2616
+#: ../daemon/gvfsbackendsftp.c:2666 ../daemon/gvfsbackendsftp.c:2712
+#: ../daemon/gvfsbackendsftp.c:2787 ../daemon/gvfsbackendsftp.c:2894
+#: ../daemon/gvfsbackendsftp.c:3011 ../daemon/gvfsbackendsftp.c:3092
+#: ../daemon/gvfsbackendsftp.c:3164 ../daemon/gvfsbackendsftp.c:3176
+#: ../daemon/gvfsbackendsftp.c:3232 ../daemon/gvfsbackendsftp.c:3274
+#: ../daemon/gvfsbackendsftp.c:3459 ../daemon/gvfsbackendsftp.c:3491
+#: ../daemon/gvfsbackendsftp.c:3546 ../daemon/gvfsbackendsftp.c:3603
+#: ../daemon/gvfsbackendsftp.c:3900 ../daemon/gvfsbackendsftp.c:3967
+#: ../daemon/gvfsbackendsftp.c:4100 ../daemon/gvfsbackendsftp.c:4160
+#: ../daemon/gvfsbackendsftp.c:4195 ../daemon/gvfsbackendsftp.c:4223
+#: ../daemon/gvfsbackendsftp.c:4331 ../daemon/gvfsbackendsftp.c:4385
+#: ../daemon/gvfsbackendsftp.c:4424 ../daemon/gvfsbackendsftp.c:4458
+#: ../daemon/gvfsbackendsftp.c:4492 ../daemon/gvfsbackendsftp.c:4507
+#: ../daemon/gvfsbackendsftp.c:4522 ../daemon/gvfsbackendsftp.c:4600
 msgid "Invalid reply received"
 msgstr "àààà àààààààà ààààààà"
 
-#: ../daemon/gvfsbackendsftp.c:2256 ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2263 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr " (àààà àààààààà)"
 
-#: ../daemon/gvfsbackendsftp.c:2341
+#: ../daemon/gvfsbackendsftp.c:2348
 msgid "Failure"
 msgstr "ààààà"
 
-#: ../daemon/gvfsbackendsftp.c:2449
-#, c-format
-msgid "Invalid icon_id '%s' in OpenIconForRead"
-msgstr "OpenIconForRead ààààààà àààà icon_id '%s' ààààà"
-
-#: ../daemon/gvfsbackendsftp.c:2745
+#: ../daemon/gvfsbackendsftp.c:2732
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "àààààààà àààà àààààààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3349
+#: ../daemon/gvfsbackendsftp.c:3336
 msgid "Unable to create temporary file"
 msgstr "ààààààààà àààà àààà ààà àààà"
 
@@ -1585,22 +1524,21 @@ 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
+#: ../daemon/gvfsbackendsmbbrowse.c:905
 #, 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
+#: ../daemon/gvfsbackendsmbbrowse.c:1007
 msgid "Failed to retrieve share list from server"
 msgstr "ààààà ààààà ààààààà àààà ààààààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendsmbbrowse.c:1157
+#: ../daemon/gvfsbackendsmbbrowse.c:1163
 msgid "Not a regular file"
 msgstr "àààààà àààà àààà"
 
-#: ../daemon/gvfsbackendsmbbrowse.c:1489
-#| msgid "Windows Network Filesystem Service"
+#: ../daemon/gvfsbackendsmbbrowse.c:1513
 msgid "Windows Network File System Service"
 msgstr "àààààà ààààààà àààà àààààà àààààààà"
 
@@ -1616,45 +1554,42 @@ msgid "Internal Error (%s)"
 msgstr "àààààà àààààà (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:624
+#: ../daemon/gvfsbackendsmb.c:625
 msgid "Failed to mount Windows share"
 msgstr "Windows àààà àààààà ààààààà ààààà"
 
-#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
+#: ../daemon/gvfsbackendsmb.c:789 ../daemon/gvfsbackendsmb.c:1285
 msgid "Unsupported seek type"
 msgstr "àààààààà ààààà àààààà"
 
-#: ../daemon/gvfsbackendsmb.c:1376
+#: ../daemon/gvfsbackendsmb.c:1377
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "àààààààà àààà ààààààààà ààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1734
-#| msgid "Invalid attribute type %s\n"
+#: ../daemon/gvfsbackendsmb.c:1751
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "àààà ààààààà àààààà (uint64 àààààààà)"
 
-#: ../daemon/gvfsbackendsmb.c:1922
-#| msgid "Target file already exists"
+#: ../daemon/gvfsbackendsmb.c:1939
 msgid "Can't rename file, filename already exists"
 msgstr "àààààà ààààààààààà ààààà, ààààààà ààààààààà ààààà"
 
-#: ../daemon/gvfsbackendsmb.c:2047
+#: ../daemon/gvfsbackendsmb.c:2064
 #, c-format
 msgid "Error moving file: %s"
 msgstr "àààà àààààààààà àààààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2119
+#: ../daemon/gvfsbackendsmb.c:2136
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "àààààà àààà ààààà ààààààààà àààààà: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2143
+#: ../daemon/gvfsbackendsmb.c:2160
 msgid "Can't recursively move directory"
 msgstr "ààààààà ààààààààààààà àààà ààà àààà"
 
-#: ../daemon/gvfsbackendsmb.c:2187
-#| msgid "Windows Shares Filesystem Service"
+#: ../daemon/gvfsbackendsmb.c:2204
 msgid "Windows Shares File System Service"
 msgstr "àààààà ààààààà àààà àààààà àààààààà"
 
@@ -1668,7 +1603,7 @@ msgstr "àààààààà ààààààà ààà ààààà
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendtrash.c:755 ../daemon/gvfsbackendtrash.c:863
+#: ../daemon/gvfsbackendtrash.c:755 ../daemon/gvfsbackendtrash.c:867
 msgid "Trash"
 msgstr "àààààààà"
 
@@ -1761,7 +1696,6 @@ msgstr ""
 "ààààà ààààà"
 
 #: ../daemon/gvfsjobunmount.c:197
-#| msgid "Filesystem is busy"
 msgid "File system is busy"
 msgstr "ààààààààààà àààààà ààà"
 
@@ -1790,38 +1724,38 @@ msgstr "%s: %s"
 
 #: ../daemon/main.c:168 ../metadata/meta-daemon.c:472
 #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:182
-#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:387
+#: ../programs/gvfs-copy.c:133 ../programs/gvfs-info.c:389
 #: ../programs/gvfs-ls.c:416 ../programs/gvfs-mime.c:97
 #: ../programs/gvfs-mime.c:107 ../programs/gvfs-mime.c:114
 #: ../programs/gvfs-mkdir.c:71 ../programs/gvfs-monitor-dir.c:126
-#: ../programs/gvfs-monitor-file.c:125 ../programs/gvfs-mount.c:1036
+#: ../programs/gvfs-monitor-file.c:125 ../programs/gvfs-mount.c:1063
 #: ../programs/gvfs-move.c:121 ../programs/gvfs-open.c:78
 #: ../programs/gvfs-open.c:90 ../programs/gvfs-rename.c:75
-#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:175
+#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:178
 #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:71
 #: ../programs/gvfs-tree.c:262
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "àààà àààààà ààààà \"%s --help\" ààààà ààà."
 
-#: ../daemon/mount.c:674
+#: ../daemon/mount.c:693
 #, c-format
 msgid "Automount failed: %s"
 msgstr "àààààààà ààààà: %s"
 
-#: ../daemon/mount.c:718 ../daemon/mount.c:779
+#: ../daemon/mount.c:737 ../daemon/mount.c:798
 msgid "The specified location is not mounted"
 msgstr "ààààààààà ààààà àààààà àààà"
 
-#: ../daemon/mount.c:723
+#: ../daemon/mount.c:742
 msgid "The specified location is not supported"
 msgstr "ààààààààà ààààà àààààààà àààà"
 
-#: ../daemon/mount.c:847
+#: ../daemon/mount.c:866
 msgid "Location is already mounted"
 msgstr "ààààà ààààààààà àààààà ààà"
 
-#: ../daemon/mount.c:856
+#: ../daemon/mount.c:875
 msgid "Location is not mountable"
 msgstr "ààààà ààààààààà ààààààààà àààà"
 
@@ -1875,7 +1809,6 @@ msgstr "àààààà àààààààà"
 
 #: ../monitor/gdu/ggdudrive.c:561 ../monitor/udisks2/gvfsudisks2drive.c:505
 #, c-format
-#| msgid "Failed to eject media; one or more volumes on the media are busy."
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr ""
 "àààààà ààààà àààààààà ààààà; àà ààààà àààààààààà ààààà àààààààààà ààà àààààà "
@@ -2245,7 +2178,6 @@ msgstr "ààààà àààà/àààààà ààààà"
 #. Translators: %s is the size of the mount (e.g. 512 MB)
 #: ../monitor/hal/ghalmount.c:336
 #, c-format
-#| msgid "%s Media"
 msgid "%s Medium"
 msgstr "%s àààààà"
 
@@ -2262,7 +2194,6 @@ msgid "%s Media"
 msgstr "%s àààààà"
 
 #: ../monitor/udisks2/gvfsudisks2mount.c:730
-#| msgid "Start Anyway"
 msgid "Eject Anyway"
 msgstr "ààààà ààààà àààà"
 
@@ -2290,7 +2221,6 @@ msgstr "ààà %s àààà ààààà ààà\n"
 #.
 #: ../monitor/udisks2/gvfsudisks2volume.c:254
 #, c-format
-#| msgid "%s Encrypted Data"
 msgid "%s Encrypted"
 msgstr "%s ààààààààà àààà"
 
@@ -2307,36 +2237,34 @@ msgstr "%s ààà"
 msgid "Volume"
 msgstr "ààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:999
+#: ../monitor/udisks2/gvfsudisks2volume.c:1008
 #, c-format
-msgid "Error storing passphrase in keyring (error code %d)"
-msgstr "àààààà (ààà ààà %d) ààààà àààààààà àààààààààà àààààà"
+#| msgid "Error storing passphrase in keyring (error code %d)"
+msgid "Error storing passphrase in keyring (%s)"
+msgstr "àààààà (%s) ààààà àààààààà àààààààààà àààààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1030
+#: ../monitor/udisks2/gvfsudisks2volume.c:1043
 #, c-format
-msgid "Error deleting invalid passphrase from keyring (error code %d)"
-msgstr "àààààà (ààà ààà %d) ààààà àààà àààààààà àààà àààààààà àààààà"
+#| msgid "Error deleting invalid passphrase from keyring (error code %d)"
+msgid "Error deleting invalid passphrase from keyring (%s)"
+msgstr "àààààà (%s) ààààà àààà àààààààà àààà àààààààà àààààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1096
+#: ../monitor/udisks2/gvfsudisks2volume.c:1108
 msgid "The unlocked device does not have a recognizable file system on it"
 msgstr "àààààààà ààààààà ààààààààààà àààà ààààààà àààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1125
+#: ../monitor/udisks2/gvfsudisks2volume.c:1137
 #, c-format
-#| msgid "Enter passphrase for key"
 msgid "Encryption passphrase for %s"
 msgstr "%s ààààà àààààààààà àààààààà"
 
-#: ../monitor/udisks2/gvfsudisks2volume.c:1295
+#: ../monitor/udisks2/gvfsudisks2volume.c:1305
 msgid "A passphrase is required to access the volume"
 msgstr "àààààààà àààààààààà àààààààà àààààà ààà"
 
 #. Translators: This is the message shown to users
-#: ../monitor/udisks2/gvfsudisks2volume.c:1310
+#: ../monitor/udisks2/gvfsudisks2volume.c:1320
 #, c-format
-#| msgid ""
-#| "Enter a password to unlock the volume\n"
-#| "The device %s contains encrypted data."
 msgid ""
 "Enter a passphrase to unlock the volume\n"
 "The passphrase is needed to access encrypted data on %s."
@@ -2351,13 +2279,12 @@ msgstr ""
 #. * is on - the first %s is the name (such as 'WD 2500JB External'), the
 #. * second %s is the description ('250 GB Hard Disk').
 #.
-#: ../monitor/udisks2/gvfsudisks2volume.c:1461
+#: ../monitor/udisks2/gvfsudisks2volume.c:1471
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../monitor/udisks2/udisks2volumemonitordaemon.c:40
-#| msgid "GVfs GDU Volume Monitor"
 msgid "GVfs UDisks2 Volume Monitor"
 msgstr "GVfs UDisks2 ààààààà àààààà"
 
@@ -2397,16 +2324,10 @@ msgstr "àààà"
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
 #: ../programs/gvfs-cat.c:146
-#| msgid "LOCATION... - concatenate LOCATIONS to standard output."
 msgid "Concatenate files and print to the standard output."
 msgstr "ààààààà àààààààààà ààààà à àààààààà ààààààààààà àààà àààà."
 
 #: ../programs/gvfs-cat.c:147
-#| msgid ""
-#| "Concatenate files at locations and print to the standard output. Works "
-#| "just like the traditional cat utility, but using gvfs location instead "
-#| "local files: for example you can use something like smb://server/resource/"
-#| "file.txt as location to concatenate."
 msgid ""
 "gvfs-cat works just like the traditional cat utility, but using gvfs\n"
 "locations instead of local files: for example you can use something\n"
@@ -2417,9 +2338,6 @@ msgstr ""
 "smb://server/resource/file.txt ààààà àààààà àààààà àààà ààà."
 
 #: ../programs/gvfs-cat.c:151
-#| msgid ""
-#| "Note: just pipe through cat if you need its formatting option like -n, -T "
-#| "or other."
 msgid ""
 "Note: just pipe through cat if you need its formatting options\n"
 "like -n, -T or other."
@@ -2428,12 +2346,12 @@ msgstr ""
 "ààààààà ààààà cat àà àààà ààà."
 
 #: ../programs/gvfs-cat.c:168 ../programs/gvfs-copy.c:131
-#: ../programs/gvfs-info.c:385 ../programs/gvfs-ls.c:414
+#: ../programs/gvfs-info.c:387 ../programs/gvfs-ls.c:414
 #: ../programs/gvfs-mime.c:94 ../programs/gvfs-mkdir.c:69
 #: ../programs/gvfs-monitor-dir.c:124 ../programs/gvfs-monitor-file.c:123
-#: ../programs/gvfs-mount.c:1034 ../programs/gvfs-move.c:119
+#: ../programs/gvfs-mount.c:1061 ../programs/gvfs-move.c:119
 #: ../programs/gvfs-open.c:76 ../programs/gvfs-rename.c:73
-#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:173
+#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:176
 #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:69
 #: ../programs/gvfs-tree.c:260
 #, c-format
@@ -2448,33 +2366,27 @@ msgid "%s: missing locations"
 msgstr "%s: à ààààààà ààààà"
 
 #: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
-#| msgid "no target directory"
 msgid "No target directory"
 msgstr "àààààà àààààààààà ààààà àààà"
 
 #: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
-#| msgid "show progress"
 msgid "Show progress"
 msgstr "àààààà ààààà"
 
 #: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
-#| msgid "prompt before overwrite"
 msgid "Prompt before overwrite"
 msgstr "ààààà ààààààààààààààààà àààààà"
 
 #: ../programs/gvfs-copy.c:47
-#| msgid "preserve all attributes"
 msgid "Preserve all attributes"
 msgstr "àààà ààààààà ààààà"
 
 #: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
 #: ../programs/gvfs-save.c:43
-#| msgid "backup existing destination files"
 msgid "Backup existing destination files"
 msgstr "àààààààààààà àààààà ààààààààà ààààà ààà"
 
 #: ../programs/gvfs-copy.c:49
-#| msgid "never follow symbolic links"
 msgid "Never follow symbolic links"
 msgstr "ààààà ààààààààà ààààààà àààà ààà ààà"
 
@@ -2488,7 +2400,7 @@ msgid "SOURCE"
 msgstr "ààààà"
 
 #: ../programs/gvfs-copy.c:121 ../programs/gvfs-move.c:109
-#: ../programs/gvfs-save.c:162
+#: ../programs/gvfs-save.c:165
 msgid "DEST"
 msgstr "àààààà"
 
@@ -2525,7 +2437,6 @@ msgid "List writable attributes"
 msgstr "àààààààà ààààààààààà àààà"
 
 #: ../programs/gvfs-info.c:38
-#| msgid "Get filesystem info"
 msgid "Get file system info"
 msgstr "ààààààààààààà àààààà ààààààà ààà"
 
@@ -2539,7 +2450,6 @@ msgstr "ààààààà"
 
 #: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
-#| msgid "Don't follow symlinks"
 msgid "Don't follow symbolic links"
 msgstr "ààààààààà ààààààà àààà ààà ààà"
 
@@ -2580,69 +2490,70 @@ msgstr "ààààààààà"
 msgid "attributes:\n"
 msgstr "ààààààà:\n"
 
-#: ../programs/gvfs-info.c:155
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:156
 #, c-format
 msgid "display name: %s\n"
 msgstr "ààà ààààà: %s\n"
 
-#: ../programs/gvfs-info.c:159
+#. Translators: This is a noun and represents and attribute of a file
+#: ../programs/gvfs-info.c:161
 #, c-format
 msgid "edit name: %s\n"
 msgstr "ààà ààààààà ààà: %s\n"
 
-#: ../programs/gvfs-info.c:165
+#: ../programs/gvfs-info.c:167
 #, c-format
 msgid "name: %s\n"
 msgstr "ààà: %s\n"
 
-#: ../programs/gvfs-info.c:172
+#: ../programs/gvfs-info.c:174
 #, c-format
 msgid "type: %s\n"
 msgstr "àààààà: %s\n"
 
-#: ../programs/gvfs-info.c:178
+#: ../programs/gvfs-info.c:180
 #, c-format
 msgid "size: "
 msgstr "àààà: "
 
-#: ../programs/gvfs-info.c:183
+#: ../programs/gvfs-info.c:185
 #, c-format
 msgid "hidden\n"
 msgstr "àààààà\n"
 
-#: ../programs/gvfs-info.c:268
+#: ../programs/gvfs-info.c:270
 msgid "Copy with file"
 msgstr "àààààà àààà àààà"
 
-#: ../programs/gvfs-info.c:272
+#: ../programs/gvfs-info.c:274
 msgid "Keep with file when moved"
 msgstr "ààààààààà àààààà àààà"
 
-#: ../programs/gvfs-info.c:309
+#: ../programs/gvfs-info.c:311
 #, c-format
 msgid "Error getting writable attributes: %s\n"
 msgstr "àààààààà ààààààà ààààààààààààààà àààààà: %s\n"
 
-#: ../programs/gvfs-info.c:314
+#: ../programs/gvfs-info.c:316
 #, c-format
 msgid "Settable attributes:\n"
 msgstr "ààààààààààààà ààààààà:\n"
 
-#: ../programs/gvfs-info.c:337
+#: ../programs/gvfs-info.c:339
 #, c-format
 msgid "Writable attribute namespaces:\n"
 msgstr "àààààààà ààààààà namespaces:\n"
 
-#: ../programs/gvfs-info.c:373 ../programs/gvfs-ls.c:397
+#: ../programs/gvfs-info.c:375 ../programs/gvfs-ls.c:397
 #: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-monitor-dir.c:112
-#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1022
+#: ../programs/gvfs-monitor-file.c:111 ../programs/gvfs-mount.c:1049
 #: ../programs/gvfs-rename.c:64 ../programs/gvfs-set-attribute.c:139
 #: ../programs/gvfs-trash.c:57 ../programs/gvfs-tree.c:248
 msgid "LOCATION"
 msgstr "ààààà"
 
-#: ../programs/gvfs-info.c:374
-#| msgid "- show info for <location>"
+#: ../programs/gvfs-info.c:376
 msgid "Show information about locations."
 msgstr "àààààààààààà àààààà ààààà."
 
@@ -2673,11 +2584,6 @@ msgid "List the contents of the locations."
 msgstr "ààààààààààà àààààààà àààààààà àààà."
 
 #: ../programs/gvfs-ls.c:399
-#| msgid ""
-#| "Concatenate files at locations and print to the standard output. Works "
-#| "just like the traditional cat utility, but using gvfs location instead "
-#| "local files: for example you can use something like smb://server/resource/"
-#| "file.txt as location to concatenate."
 msgid ""
 "gvfs-ls is similar to the traditional ls utility, but using gvfs\n"
 "locations instead of local files: for example you can use something\n"
@@ -2740,7 +2646,6 @@ msgstr "àààààà àààààà ààààààààààà
 
 #: ../programs/gvfs-mime.c:141
 #, c-format
-#| msgid "FILES... - open FILES with registered application."
 msgid "No registered applications\n"
 msgstr "àààààà àààààà àààààààààààà àààà\n"
 
@@ -2765,12 +2670,10 @@ 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"
 msgid "Create parent directories"
 msgstr "àààààà àààààààààààà ààààààà ààà"
 
 #: ../programs/gvfs-mkdir.c:58
-#| msgid "create parent directories"
 msgid "Create directories."
 msgstr "àààààààààààà ààààààà ààà."
 
@@ -2829,7 +2732,6 @@ msgid "Monitor events"
 msgstr "àààà ààààààààà ààà"
 
 #: ../programs/gvfs-mount.c:65
-#| msgid "Show extra information for List and Monitor"
 msgid "Show extra information"
 msgstr "àààà àààààà ààààà"
 
@@ -2850,27 +2752,25 @@ msgstr "enclosing mount ààààààààà àààààà: %s\n"
 
 #: ../programs/gvfs-mount.c:302
 #, c-format
-#| msgid "Error unmounting mount: %s\n"
 msgid "Error ejecting mount: %s\n"
 msgstr "ààààà: %s ààààà ààààààààà àààààà\n"
 
-#: ../programs/gvfs-mount.c:759
+#: ../programs/gvfs-mount.c:786
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "%s ààààà àààààààà àààààà: %s\n"
 
-#: ../programs/gvfs-mount.c:774
+#: ../programs/gvfs-mount.c:801
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%2$s àààà %1$s ààààà àààà\n"
 
-#: ../programs/gvfs-mount.c:825
+#: ../programs/gvfs-mount.c:852
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "ààààà àààà %s ààààà ààà ààààà àààà\n"
 
-#: ../programs/gvfs-mount.c:1023
-#| msgid "- mount <location>"
+#: ../programs/gvfs-mount.c:1050
 msgid "Mount the locations."
 msgstr "ààààààààà ààààà ààà."
 
@@ -2887,9 +2787,6 @@ msgstr "àààà %s ààààààààà àààààà: %s\n"
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
 #: ../programs/gvfs-open.c:64
-#| msgid ""
-#| "Opens the file(s) with the default application registered to handle the "
-#| "type of the file."
 msgid ""
 "Open files with the default application that\n"
 "is registered to handle files of this type."
@@ -2909,7 +2806,6 @@ msgid "NEW-NAME"
 msgstr "àààà ààà"
 
 #: ../programs/gvfs-rename.c:65
-#| msgid "- rename file"
 msgid "Rename a file."
 msgstr "àààààà ààààààààààà ààà."
 
@@ -2919,7 +2815,6 @@ msgid "Rename successful. New uri: %s\n"
 msgstr "ààààààààààà àààààà. àààà uri: %s\n"
 
 #: ../programs/gvfs-rm.c:34 ../programs/gvfs-trash.c:34
-#| msgid "ignore nonexistent files, never prompt"
 msgid "Ignore nonexistent files, never prompt"
 msgstr "àààààààààààààààà àààààààààà àààààààà ààà, ààààà àààààà ààà"
 
@@ -2936,47 +2831,48 @@ msgid "Append to end of file"
 msgstr "àààààààà àààààààà àààààààà ààà"
 
 #: ../programs/gvfs-save.c:46
-#| msgid "When creating a file, restrict access to the current user only"
 msgid "When creating, restrict access to the current user"
 msgstr "ààààààà àààààààà, ààààààààà àààààààààààààà àààààà ààààà àààà"
 
-#: ../programs/gvfs-save.c:47
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:48
 msgid "Print new etag at end"
 msgstr "ààààààààà àààà etag àà àààà ààà"
 
-#: ../programs/gvfs-save.c:48
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:50
 msgid "The etag of the file being overwritten"
 msgstr "ààààà àààà ààààààààààà àààààà etag"
 
-#: ../programs/gvfs-save.c:48
+#: ../programs/gvfs-save.c:50
 msgid "ETAG"
 msgstr "ETAG"
 
-#: ../programs/gvfs-save.c:76
+#: ../programs/gvfs-save.c:78
 #, c-format
 msgid "Error opening file: %s\n"
 msgstr "àààà ààààààààà àààààà: %s\n"
 
-#: ../programs/gvfs-save.c:109
+#: ../programs/gvfs-save.c:111
 msgid "Error reading stdin"
 msgstr "stdin ààààààààà àààààà"
 
-#: ../programs/gvfs-save.c:122
+#: ../programs/gvfs-save.c:124
 #, c-format
 msgid "Error closing: %s\n"
 msgstr "ààà àààààààà àààààà: %s\n"
 
-#: ../programs/gvfs-save.c:134
+#. Translators: The "etag" is a token allowing to verify whether a file has been modified
+#: ../programs/gvfs-save.c:137
 #, c-format
 msgid "Etag not available\n"
 msgstr "Etag àààààà àààà\n"
 
-#: ../programs/gvfs-save.c:163
+#: ../programs/gvfs-save.c:166
 msgid "Read from standard input and save to DEST."
 msgstr "àààà àààààààààà àààà ààà à ààààààààààà ààààà."
 
 #: ../programs/gvfs-set-attribute.c:36
-#| msgid "The attributes to get"
 msgid "Type of the attribute"
 msgstr "ààààààà àààààààààà ààààààà"
 
@@ -3005,7 +2901,6 @@ msgid "Attribute not specified\n"
 msgstr "ààààààà ààààààààà àààà àààà\n"
 
 #: ../programs/gvfs-set-attribute.c:176
-#| msgid "Attribute not specified\n"
 msgid "Value not specified\n"
 msgstr "ààààà ààààààààà àààà àààà\n"
 
@@ -3020,7 +2915,6 @@ msgid "Error setting attribute: %s\n"
 msgstr "ààààààà ààà àààààààà àààààà: %s\n"
 
 #: ../programs/gvfs-trash.c:58
-#| msgid "No such file or directory in target path"
 msgid "Move files or directories to the trash."
 msgstr "ààààààà ààààà àààààààààààààà àààààààààà ààààààààààà ààà."
 
@@ -3030,15 +2924,95 @@ msgid "Error trashing file: %s\n"
 msgstr "àààà ààààààààà ààààààààà àààààà: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-#| msgid "Follow symlinks, mounts and shortcuts like dirs"
 msgid "Follow symbolic links, mounts and shortcuts"
 msgstr "ààààààààà ààààààà, àààààààà à àààààààààà àààà ààà"
 
 #: ../programs/gvfs-tree.c:249
-#| msgid "- list contents of directories in a tree-like format"
 msgid "List contents of directories in a tree-like format."
 msgstr "ààààààààààààààà àààààààà àààààà ààààà-ààààààà ààààà ààààà"
 
+#~ msgid "Error creating socket: %s"
+#~ msgstr "ààààà àààààààààà àààààà: %s"
+
+#~ msgid "Error connecting to socket: %s"
+#~ msgstr "ààààààà àààààà àààààààà àààààà: %s"
+
+#~ msgid "AFP server %s declined the submitted password"
+#~ msgstr "AFP ààààààà %s àà àààààààà ààààààà àààààà"
+
+#~| msgid "Unexpected reply from server"
+#~ msgid "Received invalid reply from server"
+#~ msgstr "ààààà ààààà ààààààààà àààààààà ààààààà àààà"
+
+#~| msgid "Enter password for ftp as %s on %s"
+#~ msgid "Enter password for afp as %s on %s"
+#~ msgstr "%s àààààà %s ààààà, afp àààà ààààààà àààà"
+
+#~| msgid "Enter password for ftp on %s"
+#~ msgid "Enter password for afp on %s"
+#~ msgstr "%s àààà afp ààààà ààààààà àààà"
+
+#~| msgid "Failed to retrieve share list from server"
+#~ msgid "Failed to logout from server"
+#~ msgstr "àààààààààààà ààààà ààààààà ààààà"
+
+#~ msgid "ID not found"
+#~ msgstr "ID ààààà àààà"
+
+#~| msgid "sftp for %s on %s"
+#~ msgid "AFP volumes for %s on %s"
+#~ msgstr "%s ààààà %s àààà AFP ààà"
+
+#~ msgid "AFP volumes on %s"
+#~ msgstr "%s àààà AFP ààà"
+
+#~| msgid "sftp for %s on %s"
+#~ msgid "AFP volume %s for %s on %s"
+#~ msgstr "%2$s ààààà %3$s àààà AFP ààà %1$s"
+
+#~| msgid "sftp for %s on %s"
+#~ msgid "AFP volume %s on %s"
+#~ msgstr "AFP ààà %s, %s àààà "
+
+#~| msgid "WebDAV on %s"
+#~ msgid "WebDAV as %s on %s%s"
+#~ msgstr "%s àààààà %s%s àààà WebDAV"
+
+#~| msgid "WebDAV on %s"
+#~ msgid "WebDAV on %s%s"
+#~ msgstr "%s%s àààà WebDAV"
+
+#~| msgid "Enter password for ftp as %s on %s"
+#~ msgid "Enter password for FTP as %s on %s"
+#~ msgstr "%s àààààà %s àààà FTP ààààà ààààààà àààà"
+
+#~| msgid "Enter password for ftp on %s"
+#~ msgid "Enter password for FTP on %s"
+#~ msgstr "%s àààà FTP ààààà ààààààà àààà"
+
+#~| msgid "/ on %s"
+#~ msgid "FTP on %s"
+#~ msgstr "%s àààà FTP"
+
+#~| msgid "ftp as %s on %s"
+#~ msgid "FTP as %s on %s"
+#~ msgstr "%s ààààà %s àààà FTP"
+
+#~| msgid "Enter password for ftp as %s on %s"
+#~ msgid "Enter passphrase for key for ssh as %s on %s"
+#~ msgstr "%s àààààà %s àààà ssh ààààà àààààà àààààààà àààà"
+
+#~| msgid "Enter password for ftp as %s on %s"
+#~ msgid "Enter password for ssh as %s on %s"
+#~ msgstr "%s àààààà %s ààààà ssh ààààà ààààààà àààà"
+
+#~| msgid "/ on %s"
+#~ msgid "SFTP on %s"
+#~ msgstr "%s àààà SFTP"
+
+#~ msgid "Invalid icon_id '%s' in OpenIconForRead"
+#~ msgstr "OpenIconForRead ààààààà àààà icon_id '%s' ààààà"
+
 #~ msgid "Invalid return value from get_info"
 #~ msgstr "get_info ààààà àààà àààààà ààààà"
 



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