[gvfs] update Punjabi Translation

[Amanpreet Singh Alam <aman src gnome org>]

commit 056469287fb4434bd2ffab3d436f4b0f60157394
Author: A S Alam <aalam users sf net>
Date:   Mon Sep 3 07:18:13 2012 +0530

    update Punjabi Translation

 po/pa.po |  782 ++++++++++++++++++++++++++++++--------------------------------
 1 files changed, 373 insertions(+), 409 deletions(-)
---
diff --git a/po/pa.po b/po/pa.po
index 6127c14..3dfd6a1 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8,8 +8,8 @@ msgstr ""
 "Project-Id-Version: gvfs.HEAD\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-24 11:21+0000\n"
-"PO-Revision-Date: 2012-08-27 21:49+0530\n"
+"POT-Creation-Date: 2012-08-30 18:54+0000\n"
+"PO-Revision-Date: 2012-09-03 07:17+0530\n"
 "Last-Translator: A S Alam <aalam users sf net>\n"
 "Language-Team: Punjabi/Panjabi <punjabi-users lists sf net>\n"
 "Language: pa\n"
@@ -49,13 +49,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 "àààà àààà àààà àààààà àà ààà àààààà àà àààà"
 
@@ -70,21 +70,21 @@ msgstr "àààà àààà àààà àààààà àà àà
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
 #: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:726
-#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
-#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
-#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
-#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
-#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
-#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
-#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
+#: ../daemon/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 "ààààààà ààà àààà ààà"
 
@@ -112,7 +112,7 @@ 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"
@@ -189,34 +189,34 @@ msgstr "GVfsIcon àà àààààà àààààà àààà"
 msgid "%s File System Service"
 msgstr "%s àààà ààààà ààààà"
 
-#: ../daemon/daemon-main.c:177 ../programs/gvfs-copy.c:90
+#: ../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:235
+#: ../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:259 ../daemon/daemon-main.c:277
+#: ../daemon/daemon-main.c:260 ../daemon/daemon-main.c:278
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "ààààà: %s key=value key=value ..."
 
-#: ../daemon/daemon-main.c:275
+#: ../daemon/daemon-main.c:276
 #, c-format
 msgid "No mount type specified"
 msgstr "ààà ààààà àààà àààà ààààà"
 
-#: ../daemon/daemon-main.c:307
+#: ../daemon/daemon-main.c:308
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s àà ààààà-àààààà àààààà àà ààà àààà àà"
 
-#: ../daemon/daemon-main.c:328
+#: ../daemon/daemon-main.c:329
 msgid "error starting mount daemon"
 msgstr "ààààà àààà ààààà ààà ààààà àààà"
 
@@ -238,14 +238,12 @@ msgstr "EOS ààà"
 
 #: ../daemon/gvfsafpserver.c:198 ../daemon/gvfsafpserver.c:480
 #, c-format
-#| 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:224 ../daemon/gvfsafpserver.c:533
-#| msgid "An invalid username was provided"
 msgid "An invalid username was provided."
 msgstr "ààà ààààà-ààà àààà ààààà ààà ààà"
 
@@ -268,14 +266,11 @@ msgstr "ààààà àààààà ààà \"%s\" àààà àà
 
 #: ../daemon/gvfsafpserver.c:676 ../daemon/gvfsafpserver.c:701
 #, c-format
-#| msgid "AFP server %s doesn't support anonymous login"
 msgid "The server â%sâ doesn't support anonymous access."
 msgstr "àààà \"%s\" ààààà (anonymous) ààààà àà ààààà àààà ààà"
 
 #: ../daemon/gvfsafpserver.c:729
 #, c-format
-#| 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."
@@ -284,42 +279,37 @@ msgstr ""
 
 #: ../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 ""
 "àààà \"%s\" ààà àààààà ààà àà ààààààà àààà AFP àààà 3.0 ààà àààà àà ààààààà "
-"àà ààààà àààà ààà"
+"àà ààààà "
+"àààà ààà"
 
 #: ../daemon/gvfsafpserver.c:914
 #, c-format
-#| msgid "Permission denied"
 msgid "Permission denied."
 msgstr "àààààà àààààà ààà"
 
 #: ../daemon/gvfsafpserver.c:919
 #, c-format
-#| msgid "Command is not supported by server"
 msgid "The command is not supported by the server."
 msgstr "ààààà àààà àààà ààààà àààà ààà"
 
 #: ../daemon/gvfsafpserver.c:923
 #, c-format
-#| msgid "User's password has expired"
 msgid "Your password has expired."
 msgstr "àààààà àààààà àà àààà àààààà"
 
 #: ../daemon/gvfsafpserver.c:927
 #, c-format
-#| msgid "User's password needs to be changed"
 msgid "Your password needs to be changed."
 msgstr "àààààà àààààà àààà àà ààà ààà"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsafpserver.c:1070
 #, c-format
-#| msgid "Enter password for ssh on %s"
 msgid "Enter your password for the server â%sâ."
 msgstr "\"%s\" àààà àà àààà àààààà àààà"
 
@@ -330,23 +320,20 @@ msgid "Enter your name and password for the server â%sâ."
 msgstr "\"%s\" àààà àà àààà ààà ààà àààààà àààà"
 
 #: ../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:1364 ../daemon/gvfsafpserver.c:1666
-#: ../daemon/gvfsafpserver.c:1757
+#: ../daemon/gvfsafpserver.c:1364 ../daemon/gvfsafpserver.c:1672
+#: ../daemon/gvfsafpserver.c:1763
 #, c-format
 msgid "Unable to connect to the server. A communication problem occurred."
 msgstr "àààà ààà àààààà ààà àà ààààààà ààààà àààààà àà ààà"
 
-#: ../daemon/gvfsafpserver.c:1713
-#| msgid "Directory notification not supported"
+#: ../daemon/gvfsafpserver.c:1719
 msgid "Identification not found."
 msgstr "àààà àààà ààààà"
 
@@ -362,8 +349,9 @@ msgstr "àààà ààà ààààà àààà ààà %d àà
 
 #: ../daemon/gvfsafpvolume.c:145
 #, c-format
-msgid "Couldn't mount AFP volume %s on %s"
-msgstr "%2$s àààà AFP àààààà %1$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
@@ -371,21 +359,21 @@ msgstr "%2$s àààà AFP àààààà %1$s ààààà ààà
 #: ../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/gvfsbackendsftp.c:307 ../daemon/gvfsbackendsftp.c:1828
 #: ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "àààààà àààààà àà"
 
 #: ../daemon/gvfsafpvolume.c:394 ../daemon/gvfsafpvolume.c:1721
-#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:974
-#: ../daemon/gvfsbackendafpbrowse.c:190 ../daemon/gvfsbackendafpbrowse.c:323
-#: ../daemon/gvfsbackendafpbrowse.c:355 ../daemon/gvfsbackendarchive.c:647
-#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
-#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:1011
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
-#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:678
-#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
-#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
+#: ../daemon/gvfsafpvolume.c:2513 ../daemon/gvfsbackendafc.c:977
+#: ../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 "àààà ààààà àààà"
@@ -393,9 +381,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:2340 ../daemon/gvfsbackendsftp.c:3056
+#: ../daemon/gvfsbackendsftp.c:3395 ../daemon/gvfsbackendsftp.c:4263
 msgid "File is directory"
 msgstr "àààà ààààààààà àà"
 
@@ -407,8 +395,8 @@ msgstr "àààà àààààà àààààà ààààààà
 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:1822
 msgid "Directory not empty"
 msgstr "ààààààààà àààà àààà àà"
 
@@ -435,11 +423,11 @@ 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:4272 ../daemon/gvfsbackendsmb.c:2099
 msgid "Target file already exists"
 msgstr "àààààà àààà àààààà àà ààààà àà"
 
@@ -533,7 +521,7 @@ 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 "àààà ààààà àààà"
 
@@ -601,17 +589,17 @@ msgstr "àà-ààààà libimobiledevice àààà (%d)"
 msgid "Try again"
 msgstr "ààà-ààààààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:416 ../daemon/gvfsbackend.c:939
+#: ../daemon/gvfsbackendafc.c:416 ../daemon/gvfsbackend.c:969
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
 #: ../monitor/udisks2/gvfsudisks2mount.c:736
 msgid "Cancel"
 msgstr "ààà ààà"
 
-#: ../daemon/gvfsbackendafc.c:434 ../daemon/gvfsbackendarchive.c:550
-#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1820
-#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
-#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
-#: ../daemon/gvfsbackendsmb.c:662
+#: ../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 "ààà ààààà ààààààà"
 
@@ -645,7 +633,7 @@ msgstr "%s (ààààààà)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:532 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:532 ../monitor/afc/afcvolume.c:128
 #, c-format
 msgid "Documents on %s"
 msgstr "%s àààà àààààààà"
@@ -653,11 +641,8 @@ 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:624
+#: ../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â."
@@ -665,68 +650,80 @@ msgstr ""
 "àààà \"%s\" ààà ààà àààà àà ààà-ààà ààà ààà \"ààà-ààààààà ààà\" àààà ààààà "
 "àààà"
 
-#: ../daemon/gvfsbackendafc.c:964 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1810
-#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendrecent.c:121
-#: ../daemon/gvfsbackendsmb.c:718 ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:967 ../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:1165 ../daemon/gvfsbackendafc.c:2508
+#: ../daemon/gvfsbackendafc.c:1168 ../daemon/gvfsbackendafc.c:2532
 msgid "Backups are not yet supported."
 msgstr "àààààà àààà ààààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:1337
+#: ../daemon/gvfsbackendafc.c:1340
 msgid "Invalid seek type"
 msgstr "ààà ààà àààà"
 
-#: ../daemon/gvfsbackendafc.c:2345 ../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:2369 ../daemon/gvfsbackendafp.c:1749
+#: ../daemon/gvfsbackendftp.c:1088 ../daemon/gvfsbackendftp.c:1136
+#: ../daemon/gvfsbackendftp.c:1157 ../daemon/gvfsbackendsftp.c:1826
+#: ../daemon/gvfsbackendsftp.c:4620 ../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:1687 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
-msgid "AFP volumes for %s on %s"
-msgstr "%2$s àààà %1$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:1739
 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:4258
+#: ../daemon/gvfsbackendsmb.c:2088
 msgid "Can't move directory over directory"
 msgstr "ààààààààà àààà ààààààààà àààà àààà àà àààà"
 
@@ -739,45 +736,40 @@ msgstr "àààààà ààààà àààà àà"
 msgid "Unable to create temporary file (%s)"
 msgstr "ààààà àààà (%s) ààààà àà àààààà"
 
-#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2370
-#: ../daemon/gvfsbackendsftp.c:3420 ../daemon/gvfsbackendsmb.c:1148
+#: ../daemon/gvfsbackendafp.c:1317 ../daemon/gvfsbackenddav.c:2379
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsmb.c:1149
 msgid "The file was externally modified"
 msgstr "àààà àààààà àààà àà àà"
 
-#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1128
-#: ../daemon/gvfsbackendsftp.c:4642
+#: ../daemon/gvfsbackendafp.c:1733 ../daemon/gvfsbackendftp.c:1129
+#: ../daemon/gvfsbackendsftp.c:4630
 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 "AFP volume %s for %s on %s"
-msgstr "%3$s àààà %2$s àà %1$s AFP àààààà"
-
-#. Translators: first %s is volumename and second servername
-#: ../daemon/gvfsbackendafp.c:2063
+#: ../daemon/gvfsbackendafp.c:2061
 #, c-format
-msgid "AFP volume %s on %s"
-msgstr "%2$s àààà %1$s AFP àààààà"
+#| msgid "SFTP for %s on %s"
+msgid "%s for %s on %s"
+msgstr "%3$s àààà %2$s àà %1$s"
 
-#: ../daemon/gvfsbackendafp.c:2106
+#: ../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:2276
 #: ../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:724
-#: ../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:3868 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "àààà ààààààààà àààà àà"
 
@@ -786,46 +778,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:1830
+#: ../daemon/gvfsbackendsftp.c:2936 ../daemon/gvfsbackendsftp.c:2949
+#: ../daemon/gvfsbackendsftp.c:2969 ../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
@@ -846,28 +838,28 @@ msgstr "àààà ààààà àà"
 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:1824
+#: ../daemon/gvfsbackendsftp.c:4428
 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:968 ../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:971 ../monitor/gdu/ggdumount.c:924
 #: ../monitor/udisks2/gvfsudisks2mount.c:737
 msgid ""
 "Volume is busy\n"
@@ -876,23 +868,23 @@ msgstr ""
 "àààààà àààààà àà\n"
 "ààà ààà ààà ààààààààààà àààààà ààà àààààà ààà ààààà ààà"
 
-#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1508
+#: ../daemon/gvfsbackendcdda.c:354 ../daemon/gvfsbackendgphoto2.c:1548
 msgid "Cannot create gudev client"
 msgstr "gudev ààààà ààààà àààà àà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:374 ../daemon/gvfsbackendgphoto2.c:1566
 msgid "Cannot connect to the system bus"
 msgstr "ààààà ààà ààà àààààà àààà àààà àà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendcdda.c:385 ../daemon/gvfsbackendgphoto2.c:1578
 msgid "Cannot create libhal context"
 msgstr "libhal ààààà  àààà ààààà àà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1551
+#: ../daemon/gvfsbackendcdda.c:399 ../daemon/gvfsbackendgphoto2.c:1591
 msgid "Cannot initialize libhal"
 msgstr "libhal ààààà àààà àààà àà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:500
+#: ../daemon/gvfsbackendcdda.c:415 ../daemon/gvfsbackendcdda.c:501
 msgid "No drive specified"
 msgstr "ààààà àààà ààààà àà"
 
@@ -913,7 +905,7 @@ msgstr "ààààà %s àààà àààààà àààà àà
 msgid "cdda mount on %s"
 msgstr "cdda %s àààà ààààà àà"
 
-#: ../daemon/gvfsbackendcdda.c:463 ../daemon/gvfsbackendcdda.c:983
+#: ../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
@@ -921,93 +913,91 @@ msgstr "cdda %s àààà ààààà àà"
 msgid "Audio Disc"
 msgstr "àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:526
+#: ../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:718
+#: ../daemon/gvfsbackendcdda.c:719
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "ààààà %2$s àààà àààà %1$s àààà àà"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:827
+#: ../daemon/gvfsbackendcdda.c:828
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "ààààà %s àààà 'paranoia' ààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:890
+#: ../daemon/gvfsbackendcdda.c:891
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "ààààà %s ààà ààààà ààà ààààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:1004 ../daemon/gvfsbackendgphoto2.c:1818
+#: ../daemon/gvfsbackendcdda.c:1005 ../daemon/gvfsbackendgphoto2.c:1864
 #, c-format
 msgid "No such file"
 msgstr "àààà àà ààà àààà àààà"
 
-#: ../daemon/gvfsbackendcdda.c:1018
+#: ../daemon/gvfsbackendcdda.c:1019
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "àààà ààààà àààà àà ààà ààà àààà àààà àààà àà"
 
-#: ../daemon/gvfsbackendcdda.c:1124
+#: ../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
+#: ../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:1159
 #, 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
+#: ../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"
+#: ../daemon/gvfsbackendcomputer.c:1269 ../daemon/gvfsbackendcomputer.c:1276
 msgid "Can't start drive"
 msgstr "ààààà àààà àààà àààà àà àààà"
 
-#: ../daemon/gvfsbackendcomputer.c:1326 ../daemon/gvfsbackendcomputer.c:1333
-#| msgid "Can't stop file"
+#: ../daemon/gvfsbackendcomputer.c:1342 ../daemon/gvfsbackendcomputer.c:1349
 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 "àààà ààà àààà àààà àà àààà"
 
@@ -1016,152 +1006,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 as %s on %s%s"
-msgstr "%s%s àààà %s àààà WebDAV"
-
-#. Translators: This is the name of the WebDAV share constructed as
-#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
-#. %s and it is only shown if it is not the default http(s) port.
-#: ../daemon/gvfsbackenddav.c:493
-#, c-format
-msgid "WebDAV on %s%s"
-msgstr "%s%s àààà WebDAV"
+#| msgid "%s on %s"
+msgid "%s on %s%s"
+msgstr "%2$s%3$s àààà %1$s"
 
-#: ../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:447
+#: ../daemon/gvfsbackenddnssd.c:511 ../daemon/gvfsbackendnetwork.c:462
 msgid "Local Network"
 msgstr "àààà ààààààà"
 
-#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:828
+#: ../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:763
-#: ../daemon/gvfsbackendnetwork.c:895 ../daemon/gvfsbackendnetwork.c:896
+#: ../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
+#: ../daemon/gvfsbackendftp.c:488 ../daemon/gvfsbackendsftp.c:957
 #, c-format
-msgid "Enter password for FTP as %s on %s"
-msgstr "%2$s àààà %1$s àààà FPT àà àààààà ààà"
-
-#. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:491
-#, c-format
-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:518 ../daemon/gvfsbackendsftp.c:984
-#: ../daemon/gvfsbackendsmbbrowse.c:995 ../daemon/gvfsbackendsmb.c:619
+#: ../daemon/gvfsbackendftp.c:518 ../daemon/gvfsbackendsftp.c:981
+#: ../daemon/gvfsbackendsmbbrowse.c:1001 ../daemon/gvfsbackendsmb.c:620
 msgid "Password dialog cancelled"
 msgstr "àààààà àààààà ààà àààà ààà"
 
-#: ../daemon/gvfsbackendftp.c:630
-#, c-format
-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"
-msgstr "%2$s àààà %1$s àààà FTP"
-
-#: ../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:3261
 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"
@@ -1169,168 +1138,168 @@ 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:2939
+#: ../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
+#: ../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
+#: ../daemon/gvfsbackendgphoto2.c:3387
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "ààààà àààà (àààà ààà ààààààààà àà, àààààà àà ààààààààà àà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
+#: ../daemon/gvfsbackendgphoto2.c:3395
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
 msgstr "ààààà àààà (àààà ààààààààà àà, àà àààààà ààà àààààà àààà àà)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3361
+#: ../daemon/gvfsbackendgphoto2.c:3407
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "ààààà àààà (àààà àààà àà, àà àààààà ààà ààààààààà àà)"
@@ -1340,54 +1309,41 @@ msgstr "ààààà àààà (àààà àààà àà, àà 
 msgid "HTTP Client Error: %s"
 msgstr "HTTP ààààà àààà: %s"
 
-#: ../daemon/gvfsbackendlocaltest.c:855
+#: ../daemon/gvfsbackendlocaltest.c:856
 msgid "Directory notification not supported"
 msgstr "ààààààààà ààààààààààà ààààà àààà àà"
 
-#: ../daemon/gvfsbackendnetwork.c:159
+#: ../daemon/gvfsbackendnetwork.c:168
 msgid "File Sharing"
 msgstr "àààà àààà"
 
-#: ../daemon/gvfsbackendnetwork.c:164
+#: ../daemon/gvfsbackendnetwork.c:173
 msgid "Remote Login"
 msgstr "ààààà ààààà"
 
-#. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:323 ../daemon/gvfsbackendsmbbrowse.c:894
+#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:896
 msgid "Windows Network"
 msgstr "ààààààà ààààààà"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:948
+#: ../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"
@@ -1398,80 +1354,70 @@ 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 passphrase for key for ssh as %s on %s"
-msgstr "%2$s àààà %1$s àààà ssh àà ààààà ààààà àààà ààà"
-
-#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:960
-#, c-format
-msgid "Enter password for ssh as %s on %s"
-msgstr "%2$s àààà %1$s àààà ssh àà àààààà ààà"
-
-#. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:964
-#, c-format
-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 on %s"
+msgstr "%2$s àààà %1$s àà àààààààà ààààà àà ààà ààà"
 
 #. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:967
+#: ../daemon/gvfsbackendsftp.c:961
 #, c-format
-msgid "Enter password 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 àààà àààààààà ààààà àà ààà ààà"
 
-#: ../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"
@@ -1487,74 +1433,57 @@ msgstr ""
 "àààà ààààà "
 "àààààààà àà ààà ààààà àààààààààà ààà ààààà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:1084
+#: ../daemon/gvfsbackendsftp.c:1081
 msgid "Login dialog cancelled"
 msgstr "ààààà àààààà ààà àààà ààà"
 
-#: ../daemon/gvfsbackendsftp.c:1104
+#: ../daemon/gvfsbackendsftp.c:1101
 msgid "Can't send host identity confirmation"
 msgstr "àààà àààà ààààààà àààà àààà àà àààà"
 
-#: ../daemon/gvfsbackendsftp.c:1642 ../daemon/gvfsbackendsftp.c:1665
+#: ../daemon/gvfsbackendsftp.c:1639 ../daemon/gvfsbackendsftp.c:1662
 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"
-msgstr "%2$s àààà %1$s àà SFTP"
-
-#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1693
-#, c-format
-msgid "SFTP on %s"
-msgstr "%s àààà SFTP"
-
-#: ../daemon/gvfsbackendsftp.c:1734
+#: ../daemon/gvfsbackendsftp.c:1729
 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:2003 ../daemon/gvfsbackendsftp.c:2405
+#: ../daemon/gvfsbackendsftp.c:2464 ../daemon/gvfsbackendsftp.c:2475
+#: ../daemon/gvfsbackendsftp.c:2531 ../daemon/gvfsbackendsftp.c:2617
+#: ../daemon/gvfsbackendsftp.c:2667 ../daemon/gvfsbackendsftp.c:2713
+#: ../daemon/gvfsbackendsftp.c:2788 ../daemon/gvfsbackendsftp.c:2895
+#: ../daemon/gvfsbackendsftp.c:3012 ../daemon/gvfsbackendsftp.c:3093
+#: ../daemon/gvfsbackendsftp.c:3165 ../daemon/gvfsbackendsftp.c:3177
+#: ../daemon/gvfsbackendsftp.c:3233 ../daemon/gvfsbackendsftp.c:3275
+#: ../daemon/gvfsbackendsftp.c:3460 ../daemon/gvfsbackendsftp.c:3492
+#: ../daemon/gvfsbackendsftp.c:3547 ../daemon/gvfsbackendsftp.c:3604
+#: ../daemon/gvfsbackendsftp.c:3901 ../daemon/gvfsbackendsftp.c:3968
+#: ../daemon/gvfsbackendsftp.c:4101 ../daemon/gvfsbackendsftp.c:4161
+#: ../daemon/gvfsbackendsftp.c:4196 ../daemon/gvfsbackendsftp.c:4224
+#: ../daemon/gvfsbackendsftp.c:4332 ../daemon/gvfsbackendsftp.c:4386
+#: ../daemon/gvfsbackendsftp.c:4425 ../daemon/gvfsbackendsftp.c:4459
+#: ../daemon/gvfsbackendsftp.c:4493 ../daemon/gvfsbackendsftp.c:4508
+#: ../daemon/gvfsbackendsftp.c:4523 ../daemon/gvfsbackendsftp.c:4601
 msgid "Invalid reply received"
 msgstr "ààà àààà ààààà"
 
-#: ../daemon/gvfsbackendsftp.c:2256 ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsbackendsftp.c:2264 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:136
 msgid " (invalid encoding)"
 msgstr "(ààà àààààààà)"
 
-#: ../daemon/gvfsbackendsftp.c:2341
+#: ../daemon/gvfsbackendsftp.c:2349
 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:2733
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "àààààà àààà ààààà ààààà àààà: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3349
+#: ../daemon/gvfsbackendsftp.c:3337
 msgid "Unable to create temporary file"
 msgstr "ààààà ààààààààà ààààà àà àààààà"
 
@@ -1566,21 +1495,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 àààà ààààààà ààààà"
 
 #. 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
+#: ../daemon/gvfsbackendsmbbrowse.c:1513
 msgid "Windows Network File System Service"
 msgstr "ààààààà ààààààà àààà ààààà ààààà"
 
@@ -1596,42 +1525,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 "ààààààà ààààà ààààà ààà àà ààààà"
 
-#: ../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
+#: ../daemon/gvfsbackendsmb.c:1751
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "ààà àààààààà àààà (uint64 àààààà àà)"
 
-#: ../daemon/gvfsbackendsmb.c:1922
+#: ../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
+#: ../daemon/gvfsbackendsmb.c:2204
 msgid "Windows Shares File System Service"
 msgstr "ààààààà ààààà àààà ààààà ààààà"
 
@@ -1645,7 +1574,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 "àààà"
 
@@ -1769,7 +1698,7 @@ msgstr "%s: %s"
 #: ../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:178
@@ -1779,24 +1708,24 @@ msgstr "%s: %s"
 msgid "Try \"%s --help\" for more information."
 msgstr "ààà ààààààà àà \"%s --help\" ààààà"
 
-#: ../daemon/mount.c:692
+#: ../daemon/mount.c:693
 #, c-format
 msgid "Automount failed: %s"
 msgstr "ààà-ààààà ààààà: %s"
 
-#: ../daemon/mount.c:736 ../daemon/mount.c:797
+#: ../daemon/mount.c:737 ../daemon/mount.c:798
 msgid "The specified location is not mounted"
 msgstr "ààààà àààààà ààààà àààà àààà àà àààà"
 
-#: ../daemon/mount.c:741
+#: ../daemon/mount.c:742
 msgid "The specified location is not supported"
 msgstr "ààààà àààààà ààààà àààà àà"
 
-#: ../daemon/mount.c:865
+#: ../daemon/mount.c:866
 msgid "Location is already mounted"
 msgstr "àààààà àààààà àà ààààà àà"
 
-#: ../daemon/mount.c:874
+#: ../daemon/mount.c:875
 msgid "Location is not mountable"
 msgstr "àààààà ààààà-ààà àààà àà"
 
@@ -2276,13 +2205,11 @@ msgstr "àààààà"
 
 #: ../monitor/udisks2/gvfsudisks2volume.c:1008
 #, c-format
-#| msgid "Error storing passphrase in keyring (error code %d)"
 msgid "Error storing passphrase in keyring (%s)"
 msgstr "àààààà (%s) àààà ààà àààà ààà ààààà àààà"
 
 #: ../monitor/udisks2/gvfsudisks2volume.c:1043
 #, c-format
-#| msgid "Error deleting invalid passphrase from keyring (error code %d)"
 msgid "Error deleting invalid passphrase from keyring (%s)"
 msgstr "àààààà (%s) ààà ààà ààà ààààà ààààà àààà"
 
@@ -2386,7 +2313,7 @@ msgstr ""
 #: ../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:176
 #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:69
@@ -2584,7 +2511,7 @@ msgstr "ààààààà ààà ààà-ààà:\n"
 
 #: ../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"
@@ -2621,11 +2548,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"
@@ -2797,22 +2719,22 @@ msgstr "àààààà ààààà àààà ààààà àà
 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 "%s %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
+#: ../programs/gvfs-mount.c:1050
 msgid "Mount the locations."
 msgstr "àààààà ààààà àààà"
 
@@ -2972,6 +2894,48 @@ msgstr "àààààààà àààà, ààààà ààà àà
 msgid "List contents of directories in a tree-like format."
 msgstr "ààààààààààà àà àààààà ààà-àààà àààààà àààà ààààà"
 
+#~ msgid "AFP volumes for %s on %s"
+#~ msgstr "%2$s àààà %1$s àà AFP àààààà"
+
+#~ msgid "AFP volumes on %s"
+#~ msgstr "%s àààà AFP àààààà"
+
+#~ msgid "AFP volume %s for %s on %s"
+#~ msgstr "%3$s àààà %2$s àà %1$s AFP àààààà"
+
+#~ msgid "AFP volume %s on %s"
+#~ msgstr "%2$s àààà %1$s AFP àààààà"
+
+#~ msgid "WebDAV as %s on %s%s"
+#~ msgstr "%s%s àààà %s àààà WebDAV"
+
+#~ msgid "WebDAV on %s%s"
+#~ msgstr "%s%s àààà WebDAV"
+
+#~ msgid "Enter password for FTP as %s on %s"
+#~ msgstr "%2$s àààà %1$s àààà FPT àà àààààà ààà"
+
+#~ msgid "Enter password for FTP on %s"
+#~ msgstr "%s àààà FTP àà àààààà ààà"
+
+#~ msgid "FTP on %s"
+#~ msgstr "%s àààà FTP"
+
+#~ msgid "FTP as %s on %s"
+#~ msgstr "%2$s àààà %1$s àààà FTP"
+
+#~ msgid "Enter passphrase for key for ssh as %s on %s"
+#~ msgstr "%2$s àààà %1$s àààà ssh àà ààààà ààààà àààà ààà"
+
+#~ msgid "Enter password for ssh as %s on %s"
+#~ msgstr "%2$s àààà %1$s àààà ssh àà àààààà ààà"
+
+#~ msgid "SFTP on %s"
+#~ msgstr "%s àààà SFTP"
+
+#~ msgid "Invalid icon_id '%s' in OpenIconForRead"
+#~ msgstr "OpenIconForRead àààà àààààààà icon_id '%s'"
+
 #~ msgid "Error creating socket: %s"
 #~ msgstr "àààà ààààà ààààà àààà: %s"