Merge branch 'master' into wip/udisks2wip/udisks2

18 files changed, 6573 insertions, 3610 deletions

diff --git a/NEWS b/NEWS
index 767d9325..d3121aa5 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+Major changes in 1.11.2
+=======================
+* gvfs-mime: List recommended applications
+* daemon: Spawn fuse daemon in foreground for uClibc compatibility
+* ftp: Make ftp.mount no longer conditionally built
+* fuse: Remove the unused sys/vfs.h include
+* build: Check for util.h to prevent implicit declaration
+* Translation updates
+
 Major changes in 1.11.1
 =======================
 * Fixed several crashes from recent mutex API changes
diff --git a/client/gvfsfusedaemon.c b/client/gvfsfusedaemon.c
index d8a13e5e..8cf1c01e 100644
--- a/client/gvfsfusedaemon.c
+++ b/client/gvfsfusedaemon.c
@@ -26,7 +26,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sys/vfs.h>
 #include <sys/time.h>
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/configure.ac b/configure.ac
index d7ceb772..443d6e52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 AC_PREREQ([2.64])
 
-AC_INIT([gvfs],[1.11.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
+AC_INIT([gvfs],[1.11.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
 AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-pax])
 AM_CONFIG_HEADER(config.h)
 
@@ -100,7 +100,7 @@ dnl ****************************
 dnl *** Checks for pty stuff ***
 dnl ****************************
 
-AC_CHECK_HEADERS(sys/un.h stropts.h termios.h utmp.h sys/uio.h sys/param.h)
+AC_CHECK_HEADERS(sys/un.h stropts.h termios.h util.h utmp.h sys/uio.h sys/param.h)
 
 # Check for PTY handling functions.
 AC_CHECK_FUNCS(getpt posix_openpt grantpt unlockpt ptsname ptsname_r)
diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index b19ee891..79da0183 100644
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -41,12 +41,12 @@ service_DATA = gvfs-daemon.service
 
 libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network
 
-mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
-mount_DATA =  sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
+mount_in_files = sftp.mount.in ftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in
+mount_DATA =  sftp.mount ftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount
 
-mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in 
+mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in
 if HAVE_HTTP
-mount_DATA += http.mount dav.mount ftp.mount
+mount_DATA += http.mount dav.mount
 if HAVE_AVAHI
 mount_DATA += dav+sd.mount
 endif
diff --git a/daemon/main.c b/daemon/main.c
index 2b2d5496..b07fa665 100644
--- a/daemon/main.c
+++ b/daemon/main.c
@@ -104,16 +104,23 @@ main (int argc, char *argv[])
   if (!no_fuse)
     {
       char *fuse_path;
-      char *argv2[3];
+      char *argv2[4];
       
       fuse_path = g_build_filename (g_get_home_dir (), ".gvfs", NULL);
       
       if (!g_file_test (fuse_path, G_FILE_TEST_EXISTS))
 	g_mkdir (fuse_path, 0700);
       
+      /* The -f (foreground) option prevent libfuse to call daemon(). */
+      /* First, this is not required as g_spawn_async() already       */
+      /* detach the process. Secondly, calling daemon() and then      */
+      /* pthread_create() produce an undefined result accoring to     */
+      /* Opengroup. On system with the uClibc library this will badly */
+      /* hang the process.                                            */
       argv2[0] = LIBEXEC_DIR "/gvfs-fuse-daemon";
-      argv2[1] = fuse_path;
-      argv2[2] = NULL;
+      argv2[1] = "-f";
+      argv2[2] = fuse_path;
+      argv2[3] = NULL;
       
       g_spawn_async (NULL,
 		     argv2,
diff --git a/po/ast.po b/po/ast.po
index 5fae1816..3933a5d8 100644
--- a/po/ast.po
+++ b/po/ast.po
@@ -1,92 +1,81 @@
 # Asturian translation for gvfs.
 # Copyright (C) 2010 gvfs's COPYRIGHT HOLDER
 # This file is distributed under the same license as the gvfs package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# Xandru Armesto <xandru@softastur.org>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&component=general\n"
-"POT-Creation-Date: 2010-01-03 15:13+0000\n"
-"PO-Revision-Date: 2010-01-04 18:32+0100\n"
-"Last-Translator: astur <malditoastur@gmail.com>\n"
-"Language-Team: Asturian <alministradores@softastur.org>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&k"
+"eywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-19 17:01+0000\n"
+"PO-Revision-Date: 2011-12-22 18:33+0200\n"
+"Last-Translator: Xandru Armesto <xandru@softastur.org>\n"
+"Language-Team: Softastur alministradores@softastur.org\n"
+"Language: ast\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
+"X-Launchpad-Export-Date: 2011-10-23 16:28+0000\n"
 "X-Poedit-Language: asturian\n"
+"X-Project-Style: gnome\n"
 
-#: ../client/gdaemonfile.c:498
-#: ../client/gdaemonfile.c:2376
+#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
-msgstr "La operación nun ta soportada, los ficheros tán en distintos puntos de montaxe"
+msgstr ""
+"La operación nun ta soportada, los ficheros tán en distintos puntos de "
+"montaxe"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:868
-#: ../client/gdaemonfile.c:902
-#: ../client/gdaemonfile.c:1017
-#: ../client/gdaemonfile.c:1096
-#: ../client/gdaemonfile.c:1159
-#: ../client/gdaemonfile.c:1222
-#: ../client/gdaemonfile.c:1288
-#: ../client/gdaemonfile.c:1350
-#: ../client/gdaemonfile.c:1367
-#: ../client/gdaemonfile.c:1851
-#: ../client/gdaemonfile.c:1880
-#: ../client/gdaemonfile.c:2036
-#: ../client/gdaemonfile.c:2536
-#: ../client/gdaemonfile.c:2585
-#: ../client/gdaemonfile.c:2649
-#: ../client/gdaemonfile.c:2733
-#: ../client/gdaemonfile.c:2808
-#: ../client/gdaemonfile.c:2996
-#: ../client/gdaemonfile.c:3076
-#: ../client/gvfsiconloadable.c:145
+#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
+#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
+#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
+#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
+#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
+#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
+#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
+#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
+#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
+#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
 msgstr "%s devolvió un valor non válidu"
 
-#: ../client/gdaemonfile.c:985
-#: ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Nun pudo obtenese'l descriptor del ficheru de fluxu"
 
-#: ../client/gdaemonfile.c:1106
-#: ../client/gdaemonfile.c:1169
-#: ../client/gdaemonfile.c:1232
-#: ../client/gdaemonfile.c:1298
-#: ../client/gdaemonfile.c:2615
-#: ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Nun s'obtuvo un descriptor del ficheru de fluxu"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1964
+#: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
 msgstr "Nun pudo atopase'l puntu de montaxe axuntu"
 
-#: ../client/gdaemonfile.c:1994
+#: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Nome de ficheru non válidu %s"
 
-#: ../client/gdaemonfile.c:2232
-#: ../client/gdaemonvfs.c:1188
-#: ../client/gdaemonvfs.c:1323
-#: ../client/gdaemonvfs.c:1376
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Error al afitar los metadatos del ficheru: %s"
 
-#: ../client/gdaemonfile.c:2233
-#: ../client/gdaemonvfs.c:1377
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "los valores tienen de ser cadenes o llistes de cadenes"
 
-#: ../client/gdaemonfileenumerator.c:448
+#: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
+#: ../client/gdaemonfileenumerator.c:600
 #: ../client/gdaemonfileinputstream.c:630
 #: ../client/gdaemonfileinputstream.c:783
 #: ../client/gdaemonfileinputstream.c:901
@@ -95,38 +84,22 @@ msgstr "los valores tienen de ser cadenes o llistes de cadenes"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052
-#: ../client/gvfsdaemondbus.c:1048
-#: ../daemon/gvfsbackendobexftp.c:1066
-#: ../daemon/gvfsbackendobexftp.c:1087
-#: ../daemon/gvfsbackendobexftp.c:1206
-#: ../daemon/gvfsbackendobexftp.c:1343
-#: ../daemon/gvfsbackendobexftp.c:1407
-#: ../daemon/gvfsbackendobexftp.c:1609
-#: ../daemon/gvfsbackendobexftp.c:1716
-#: ../daemon/gvfsbackendobexftp.c:1878
-#: ../daemon/gvfsbackendobexftp.c:1905
-#: ../daemon/gvfsbackendobexftp.c:1964
-#: ../daemon/gvfsbackendobexftp.c:1986
-#: ../daemon/gvfsbackendobexftp.c:2049
-#: ../daemon/gvfsbackendobexftp.c:2068
-#: ../daemon/gvfsbackendsmb.c:1163
-#: ../daemon/gvfsbackendtest.c:91
-#: ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187
-#: ../daemon/gvfschannel.c:319
-#: ../daemon/gvfsftptask.c:202
-#: ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514
-#: ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750
-#: ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936
-#: ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471
-#: ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807
-#: ../monitor/proxy/gproxyvolume.c:884
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
+#: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Encaboxóse la operación"
 
@@ -154,17 +127,16 @@ msgstr "Final de fluxu"
 msgid "Seek not supported on stream"
 msgstr "Nun se permite guetar nel fluxu"
 
-#: ../client/gdaemonvfs.c:832
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Error al obtener la información de montaxe: %s"
 
-#: ../client/gdaemonvfs.c:1189
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Nun puede coneutar col bus del sistema"
 
-#: ../client/gvfsdaemondbus.c:570
-#: ../client/gvfsdaemondbus.c:1002
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Error al coneutar col degorriu: %s"
@@ -179,11 +151,11 @@ msgstr "Error al crear el socket: %s"
 msgid "Error connecting to socket: %s"
 msgstr "Error al coneutar col socket: %s"
 
-#: ../common/gvfsdaemonprotocol.c:521
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
 msgstr "Formatu d'información del ficheru non válidu"
 
-#: ../common/gvfsdaemonprotocol.c:538
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
 msgstr "El conteníu de la llista d'información del atributu nun ye válidu"
 
@@ -215,8 +187,12 @@ msgstr "Error al resolver «%s» serviciu «%s» nel dominiu «%s»"
 #.
 #: ../common/gvfsdnssdresolver.c:1126
 #, c-format
-msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
-msgstr "Error al resolver «%s» serviciu «%s» nel dominiu «%s». Falten ún o más rexistros TXT. Claves requeríes: «%s»."
+msgid ""
+"Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT "
+"records are missing. Keys required: \"%s\"."
+msgstr ""
+"Error al resolver «%s» serviciu «%s» nel dominiu «%s». Falten ún o más "
+"rexistros TXT. Claves requeríes: «%s»."
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -228,8 +204,7 @@ msgstr "Error al resolver «%s» serviciu «%s» nel dominiu «%s». Falten ún
 msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
 msgstr "Expiró'l tiempu al resolver «%s» serviciu «%s» nel dominiu «%s»"
 
-#: ../common/gvfsdnssdutils.c:233
-#: ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:233 ../common/gvfsdnssdutils.c:263
 #: ../common/gvfsdnssdutils.c:280
 #, c-format
 msgid "Malformed dns-sd encoded_triple '%s'"
@@ -244,219 +219,552 @@ msgstr "Nun puede remanase la versión %d de la codificación GVfsIcon"
 msgid "Malformed input data for GVfsIcon"
 msgstr "Datos d'entrada GVfsIcon malformaos"
 
-#: ../daemon/daemon-main.c:76
-#: ../daemon/daemon-main.c:230
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Error al coneutar con D-Bus: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "Sistema de ficheros %s"
 
-#: ../daemon/daemon-main.c:110
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Error: %s"
 
-#: ../daemon/daemon-main.c:155
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Usu: %s --spawner dbus-id camín_del_oxetu"
 
-#: ../daemon/daemon-main.c:179
-#: ../daemon/daemon-main.c:197
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Usu: %s contraseña=valor contraseña=valor …"
 
-#: ../daemon/daemon-main.c:195
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Nun s'especificó la triba de montaxe"
 
-#: ../daemon/daemon-main.c:265
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "el puntu de montaxe pa %s yá se ta usando"
 
-#: ../daemon/daemon-main.c:276
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "error al aniciar el degorriu de montáu"
 
-#: ../daemon/gvfsbackend.c:933
-#: ../monitor/gdu/ggdumount.c:921
-msgid "Unmount Anyway"
-msgstr "Desmontar de toes formes"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "Conseguisti EOS"
 
-#: ../daemon/gvfsbackend.c:934
-#: ../monitor/gdu/ggdudrive.c:1021
-#: ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "Encaboxar"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "El sirvidor nun permite contraseñes más llargues de 256 caráuteres"
+
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "Se dió un nome d'usuariu non válidu"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr "El sirvidor AFP %s refugó la contraseña unviada"
+
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "Falló l'accesu al sirvidor AFP %s"
 
-#: ../daemon/gvfsbackend.c:936
-#: ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "El sirvidor nun permite contraseñes más llargues de 64 caráuteres"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "El sirvidor AFP %s nun permite conexones anónimes"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr "Falló la conexón anónima al sirvidor AFP %s col códigu d'error: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
 msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
+"Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
-"El volume ta ocupáu\n"
-"Una o más aplicaciones tienen el volume ocupáu."
+"Falló la conexón al sirvidor AFP %s (nun s'alcontró un mecanismu "
+"d'autenticación afayadizu)"
 
-#: ../daemon/gvfsbackendafc.c:145
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+msgid "Failed to connect to server (%s)"
+msgstr "Nun se pudo coneutar al sirvidor (%s)"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+msgid "Enter password for afp as %s on %s"
+msgstr "Escribi la contraseña pa afp como %s en %s"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+msgid "Enter password for afp on %s"
+msgstr "Escribi la contraseña pa afp en %s"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "Encaboxóse'l diálogu de la contraseña"
+
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Fallu de control de ficheros internu d'Apple"
 
-#: ../daemon/gvfsbackendafc.c:149
-#: ../daemon/gvfsbackendftp.c:633
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "El ficheru nun esiste"
 
-#: ../daemon/gvfsbackendafc.c:152
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "El direutoriu nun ta baleru"
 
-#: ../daemon/gvfsbackendafc.c:156
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "El preséu nun dio rempuesta"
 
-#: ../daemon/gvfsbackendafc.c:160
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "Encaboxóse la conexón"
 
-#: ../daemon/gvfsbackendafc.c:164
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Recibiéronse datos non válidos del control de ficheros d'Apple"
 
-#: ../daemon/gvfsbackendafc.c:168
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Fallu non remanable de control de ficheros d'Apple (%d)"
 
-#: ../daemon/gvfsbackendafc.c:185
+#: ../daemon/gvfsbackendafc.c:249
+msgid "Listing applications installed on device failed"
+msgstr "Falló al llistar les aplicaciones instalaes nel dispositivu"
+
+#: ../daemon/gvfsbackendafc.c:265
+msgid "Accessing application icons on device failed"
+msgstr "Falló al acceder a los iconos d'aplicación nel dispositivu"
+
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Fallu de bloquéu: argumentu non válidu"
 
-#: ../daemon/gvfsbackendafc.c:189
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "Permisu denegáu"
+
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Fallu de bloquéu non remanable (%d)"
 
-#: ../daemon/gvfsbackendafc.c:206
-msgid "iPhone Device Error: Invalid Argument"
-msgstr "Fallu del preséu iPhone: argumentu non válidu"
+#: ../daemon/gvfsbackendafc.c:307
+msgid "libimobiledevice Error: Invalid Argument"
+msgstr "Fallu de libimobiledevice: argumentu non válidu"
 
-#: ../daemon/gvfsbackendafc.c:210
-msgid "iPhone Device Error: No device found. Make sure usbmuxd is set up correctly."
-msgstr "Fallu del preséu iPhone: Nun s'alcontró'l preséu. Asegúrate de que usbmuxd ta configuráu correcho."
+#: ../daemon/gvfsbackendafc.c:311
+msgid ""
+"libimobiledevice Error: No device found. Make sure usbmuxd is set up "
+"correctly."
+msgstr ""
+"Fallu de libimobiledevice: nun s'alcontró el preséu. Asegúrate de que "
+"usbmuxd ta configuráu correchamente."
 
-#: ../daemon/gvfsbackendafc.c:213
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
-msgid "Unhandled iPhone Device error (%d)"
-msgstr "Fallu non remanable del preséu iPhone (%d)"
+msgid "Unhandled libimobiledevice error (%d)"
+msgstr "Fallu non remanable de libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:274
-#: ../daemon/gvfsbackendarchive.c:529
-#: ../daemon/gvfsbackendarchive.c:558
-#: ../daemon/gvfsbackenddav.c:1631
-#: ../daemon/gvfsbackendhttp.c:315
-#: ../daemon/gvfsbackendobexftp.c:842
-#: ../daemon/gvfsbackendobexftp.c:858
-#: ../daemon/gvfsbackendobexftp.c:877
-#: ../daemon/gvfsbackendsmb.c:648
+#: ../daemon/gvfsbackendafc.c:382
+msgid "Try again"
+msgstr "Vuelve a intentalo"
+
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "Encaboxar"
+
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Especificación de montaxe non válida"
 
-#: ../daemon/gvfsbackendafc.c:280
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
-msgstr "Allugamientu AFC non válidu: tien de ser de la forma afc://uuid:númberu-de-puertu"
-
-#: ../daemon/gvfsbackendafc.c:295
-#, c-format
-msgid "Service %d on Apple Mobile Device"
-msgstr "Serviciu %d nel preséu móvil d'Apple"
+msgstr ""
+"Allugamientu AFC non válidu: tien de ser de la forma afc://uuid:númberu-de-"
+"puertu"
 
-#: ../daemon/gvfsbackendafc.c:301
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Preséu móvil d'Apple"
 
-#: ../daemon/gvfsbackendafc.c:351
+#: ../daemon/gvfsbackendafc.c:427
+#, c-format
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Dispositivu móvil de Apple, desbloquiáu"
+
+#: ../daemon/gvfsbackendafc.c:432
+#, c-format
+msgid "Documents on Apple Mobile Device"
+msgstr "Documentos nel preséu móvil de Apple"
+
+#: ../daemon/gvfsbackendafc.c:490
+#, c-format
+msgid "%s (jailbreak)"
+msgstr "%s («jailbreak»)"
+
+#. translators:
+#. * This is "Documents on foo" where foo is the device name, eg.:
+#. * Documents on Alan Smithee's iPhone
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
+#, c-format
+msgid "Documents on %s"
+msgstr "Documentación sobre %s"
+
+#. translators:
+#. * %s is the device name. 'Try again' is the caption of the button
+#. * shown in the dialog which is defined above.
+#: ../daemon/gvfsbackendafc.c:579
+#, c-format
+msgid ""
+"The device '%s' is locked. Enter the passcode on the device and click 'Try "
+"again'."
+msgstr ""
+"El preséu '%s' ta bloqueáu. Escribi la contraseña nel preséu y calca \"Volver "
+"a intentalo\"."
+
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
+#: ../daemon/gvfsbackendtrash.c:232
+msgid "Can't open directory"
+msgstr "Nun puede abrise'l direutoriu"
+
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
+#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+msgid "File doesn't exist"
+msgstr "El ficheru nun esiste"
 
-#: ../daemon/gvfsbackendafc.c:546
-#: ../daemon/gvfsbackendafc.c:1253
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "Entá nun se sofiten los respaldos."
 
-#: ../daemon/gvfsbackendafc.c:684
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "Triba de gueta non sofitada"
 
-#: ../daemon/gvfsbackendafc.c:1172
-#: ../daemon/gvfsbackendsftp.c:1786
-#: ../daemon/gvfsbackendsftp.c:4591
-#: ../daemon/gvfsbackendsmb.c:1702
-#: ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "Operación non sofitada"
 
-#. 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:318
-#: ../daemon/gvfsbackendsftp.c:2223
-#: ../daemon/gvfsftpdircache.c:419
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "Se recibió del sirvidor un códigu de fallu: %d"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "El ficheru nun puede montase"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
 #, c-format
-msgid "/ on %s"
-msgstr "/ en %s"
+msgid "AFP shares for %s on %s"
+msgstr "Comparticiones AFP de %s en %s"
 
-#: ../daemon/gvfsbackendarchive.c:518
-#: ../daemon/gvfsbackendftp.c:564
-#: ../daemon/gvfsbackendsftp.c:1714
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+msgid "AFP shares on %s"
+msgstr "Comparticiones AFP en %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
 msgid "No hostname specified"
 msgstr "Nun s'especificó un nome de sirvidor"
 
-#: ../daemon/gvfsbackendarchive.c:616
-#: ../daemon/gvfsbackendarchive.c:660
-#: ../daemon/gvfsbackendarchive.c:710
-#: ../daemon/gvfsbackendarchive.c:739
-#: ../daemon/gvfsbackendcdda.c:986
-#: ../daemon/gvfsbackendcomputer.c:627
-#: ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:964
-#: ../daemon/gvfsbackendnetwork.c:646
-#: ../daemon/gvfsbackendsmbbrowse.c:1085
-#: ../daemon/gvfsbackendsmbbrowse.c:1152
-#: ../daemon/gvfsbackendsmbbrowse.c:1324
-#: ../daemon/gvfsbackendsmbbrowse.c:1394
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Serviciu Apple Filing Protocol"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+msgid "File is a directory"
+msgstr "El ficheru ye un direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "Demasiaos ficheros abiertos"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "Nun hai espaciu bastante nel volume"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+msgid "Target file is open"
+msgstr "El ficheru oxetivu ta abiertu"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "El ficheru destín yá esiste"
+
+#: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+msgid "Ancestor directory doesn't exist"
+msgstr "El direutoriu antepasáu nun existe"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "El volume ye de sólo llectura"
+
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "El direutoriu nun ta baleru"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "L'oxetu destín ta marcáu como DeleteInhibit"
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+msgid "Target object doesn't exist"
+msgstr "L'oxetu destín nun esiste"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "Nun s'alcontró la ID"
+
+#: ../daemon/gvfsbackendafp.c:1452
+msgid "Can't move directory into one of it's descendants"
+msgstr "Nun se puede mover el direutoriu a ún de los sos descendientes"
+
+#: ../daemon/gvfsbackendafp.c:1456
+msgid "Can't move sharepoint into a shared directory"
+msgstr "Nun se puede mover un puntu compartíu a un direutoriu compartíu"
+
+#: ../daemon/gvfsbackendafp.c:1460
+msgid "Can't move a shared directory into the Trash"
+msgstr "Nun se puede mover un direutoriu compartíu a la puxarra"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "L'oxetu que se ta moviendo ta marcáu como RenameInhibit"
+
+#: ../daemon/gvfsbackendafp.c:1472
+msgid "Object being moved doesn't exist"
+msgstr "L'oxetu que se ta moviendo nun existe"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "El sirvidor nun permite la operación FPCopyFile"
+
+#: ../daemon/gvfsbackendafp.c:1585
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "Nun se puede abrir el ficheru d'orixe como Llectura/Escrituradenegada"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "El ficheru d'orixen o'l direutoriu de destín nun existen"
+
+#: ../daemon/gvfsbackendafp.c:1601
+msgid "Source file is a directory"
+msgstr "El ficheru d'orixe ye un direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "Nun puede copiase un direutoriu sobro otru direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "El ficheru ye un direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "Nun puede copiase recursivamente un direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "Nun puede movese un direutoriu sobro un direutoriu"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+msgid "Can't rename volume"
+msgstr "Nun se puede renomar un volume"
+
+#: ../daemon/gvfsbackendafp.c:2218
+msgid "Object with that name already exists"
+msgstr "Yá existe un oxetu con esti nome"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "L'oxetu oxetivu ta marcáu como RenameInhibit"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "El volume ye planu y nun permite direutorios"
+
+#: ../daemon/gvfsbackendafp.c:2362
+msgid "Target directory already exists"
+msgstr "El direutorio oxetivu yá existe"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "El ficheru nun ta abiertu p'accesu d'escritura"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "El ficheru nun ta abiertu p'accesu de llectura"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "Existe un conflictu de bloquéu de rangos"
+
+#: ../daemon/gvfsbackendafp.c:3212
 #, c-format
-msgid "File doesn't exist"
-msgstr "El ficheru nun esiste"
+msgid "Couldn't create temporary file (%s)"
+msgstr "Nun se pudo crear el ficheru temporal (%s)"
 
-#: ../daemon/gvfsbackendarchive.c:624
-#: ../daemon/gvfsbackendcomputer.c:645
-#: ../daemon/gvfsbackendgphoto2.c:1877
-#: ../daemon/gvfsbackendobexftp.c:1052
-#: ../daemon/gvfsbackendsmb.c:702
-#: ../daemon/gvfsbackendtrash.c:232
-msgid "Can't open directory"
-msgstr "Nun puede abrise'l direutoriu"
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "El ficheru modificóse esternamente"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "les copies de respaldu nun tán sofitaes entá"
+
+#: ../daemon/gvfsbackendafp.c:3539
+msgid "Directory doesn't exist"
+msgstr "La carpeta nun existe"
+
+#: ../daemon/gvfsbackendafp.c:3543
+msgid "Target object is not a directory"
+msgstr "L'oxetu oxetivu nun ye un direutoriu"
 
-#: ../daemon/gvfsbackendarchive.c:748
-#: ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:714
-#: ../daemon/gvfsbackenddnssd.c:439
-#: ../daemon/gvfsbackendftp.c:258
-#: ../daemon/gvfsbackendnetwork.c:693
-#: ../daemon/gvfsbackendsftp.c:3837
-#: ../daemon/gvfsftpdircache.c:154
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "Triba d'atributu non válida (esperábase uint32)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+msgid "Command not supported"
+msgstr "Orde nun permitida"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "La contraseña d'usuario caducó"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "Hai que camudar la contraseña d'usuariu"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FPGetUserInfo falló (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "Volume AFP %s pa %s en %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+msgid "AFP volume %s on %s"
+msgstr "Volume AFP %s en %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "Nun se puede montar el volume AFP %s en %s"
+
+#: ../daemon/gvfsbackendafp.c:4303
+msgid "No volume specified"
+msgstr "Nun s'especificó volume"
+
+#. 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:2269
+#: ../daemon/gvfsftpdircache.c:431
+#, c-format
+msgid "/ on %s"
+msgstr "/ en %s"
+
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
+#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "El ficheru nun ye un direutoriu"
 
@@ -469,37 +777,21 @@ msgstr "Grabar"
 msgid "Unable to create temporary directory"
 msgstr "Nun pudo criase'l direutoriu temporal"
 
-#: ../daemon/gvfsbackendburn.c:405
-#: ../daemon/gvfsbackendburn.c:416
-#: ../daemon/gvfsbackendburn.c:451
-#: ../daemon/gvfsbackendburn.c:672
-#: ../daemon/gvfsbackendburn.c:717
-#: ../daemon/gvfsbackendburn.c:743
-#: ../daemon/gvfsbackendburn.c:781
-#: ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008
-#: ../daemon/gvfsbackendftp.c:690
-#: ../daemon/gvfsbackendgphoto2.c:1205
-#: ../daemon/gvfsbackendgphoto2.c:2198
-#: ../daemon/gvfsbackendgphoto2.c:2917
-#: ../daemon/gvfsbackendsftp.c:1790
-#: ../daemon/gvfsbackendsftp.c:2903
-#: ../daemon/gvfsbackendsftp.c:2916
-#: ../daemon/gvfsbackendsftp.c:2936
-#: ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
+#: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
+#: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
+#: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
+#: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "El ficheru o direutoriu nun esiste"
 
-#: ../daemon/gvfsbackendburn.c:425
-#: ../daemon/gvfsbackenddav.c:2223
-#: ../daemon/gvfsbackendsftp.c:1782
-msgid "Directory not empty"
-msgstr "El direutoriu nun ta baleru"
-
-#: ../daemon/gvfsbackendburn.c:459
-#: ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1791
+#: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "Nun puede copiase un ficheru sobro un direutoriu"
 
@@ -508,57 +800,34 @@ msgstr "Nun puede copiase un ficheru sobro un direutoriu"
 msgid "CD/DVD Creator"
 msgstr "Creador de CD/DVD"
 
-#: ../daemon/gvfsbackendburn.c:753
-#: ../daemon/gvfsbackendburn.c:789
-#: ../daemon/gvfsbackendburn.c:924
-#: ../daemon/gvfsbackendburn.c:986
-#: ../daemon/gvfsbackendburn.c:990
-#: ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2991
+#: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
+#: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
+#: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "El ficheru yá esiste"
 
-#: ../daemon/gvfsbackendburn.c:828
-#: ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120
-#: ../daemon/gvfsjobcopy.c:169
-#: ../daemon/gvfsjobcreatemonitor.c:140
-#: ../daemon/gvfsjobcreatemonitor.c:151
-#: ../daemon/gvfsjobcreatemonitor.c:174
-#: ../daemon/gvfsjobcreatemonitor.c:192
-#: ../daemon/gvfsjobdelete.c:122
-#: ../daemon/gvfsjobenumerate.c:256
-#: ../daemon/gvfsjobmakedirectory.c:122
-#: ../daemon/gvfsjobmount.c:109
-#: ../daemon/gvfsjobmountmountable.c:156
-#: ../daemon/gvfsjobmove.c:168
-#: ../daemon/gvfsjobopenforread.c:133
-#: ../daemon/gvfsjobopenforwrite.c:151
-#: ../daemon/gvfsjobopenforwrite.c:165
-#: ../daemon/gvfsjobopenforwrite.c:179
-#: ../daemon/gvfsjobopeniconforread.c:120
-#: ../daemon/gvfsjobpollmountable.c:125
-#: ../daemon/gvfsjobpull.c:175
-#: ../daemon/gvfsjobpush.c:175
-#: ../daemon/gvfsjobqueryattributes.c:135
-#: ../daemon/gvfsjobqueryfsinfo.c:131
-#: ../daemon/gvfsjobqueryinfo.c:149
-#: ../daemon/gvfsjobqueryinforead.c:119
-#: ../daemon/gvfsjobqueryinfowrite.c:119
-#: ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119
-#: ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:150
-#: ../daemon/gvfsjobsetdisplayname.c:127
-#: ../daemon/gvfsjobstartmountable.c:132
-#: ../daemon/gvfsjobstopmountable.c:135
-#: ../daemon/gvfsjobtrash.c:122
-#: ../daemon/gvfsjobunmountmountable.c:139
-#: ../daemon/gvfsjobunmountmountable.c:154
-#: ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173
-#: ../monitor/gdu/ggdumount.c:1257
-#: ../monitor/gdu/ggduvolume.c:1595
+#: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
+#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141 ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175 ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123 ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123 ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157 ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134 ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166 ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117 ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176 ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136 ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
+#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobsetattribute.c:151 ../daemon/gvfsjobsetdisplayname.c:128
+#: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
+#: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
+#: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "El backend nun sofita la operación"
 
@@ -566,57 +835,47 @@ msgstr "El backend nun sofita la operación"
 msgid "No such file or directory in target path"
 msgstr "El ficheru o direutoriu nun esiste nel camín de destín"
 
-#: ../daemon/gvfsbackendburn.c:876
-#: ../daemon/gvfsbackendftp.c:1350
-#: ../daemon/gvfsbackendobexftp.c:1760
-msgid "Can't copy directory over directory"
-msgstr "Nun puede copiase un direutoriu sobro otru direutoriu"
-
-#: ../daemon/gvfsbackendburn.c:885
-#: ../daemon/gvfsbackendobexftp.c:1768
-#: ../daemon/gvfsbackendobexftp.c:1799
-#: ../daemon/gvfsbackendsftp.c:1784
-#: ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "El ficheru destín yá esiste"
 
-#: ../daemon/gvfsbackendburn.c:892
-#: ../daemon/gvfsbackendftp.c:1373
-#: ../daemon/gvfsbackendobexftp.c:1775
-msgid "Can't recursively copy directory"
-msgstr "Nun puede copiase recursivamente un direutoriu"
-
-#: ../daemon/gvfsbackendburn.c:950
-#: ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2571
-#: ../daemon/gvfsbackendgphoto2.c:2780
-#: ../daemon/gvfsbackendgphoto2.c:2877
-#: ../daemon/gvfsbackendgphoto2.c:2970
+#: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Non sofitáu"
 
-#: ../daemon/gvfsbackendcdda.c:332
-#: ../daemon/gvfsbackendgphoto2.c:1508
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "Desmontar de toes formes"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"El volume ta ocupáu\n"
+"Una o más aplicaciones tienen el volume ocupáu."
+
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "Nun puede criase'l veceru gudev"
 
-#: ../daemon/gvfsbackendcdda.c:352
-#: ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Nun pudo coneutase col bus del sistema"
 
-#: ../daemon/gvfsbackendcdda.c:363
-#: ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Nun pudo criase'l contestu libhal"
 
-#: ../daemon/gvfsbackendcdda.c:377
-#: ../daemon/gvfsbackendgphoto2.c:1551
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Nun puede anicializase libhal"
 
-#: ../daemon/gvfsbackendcdda.c:393
-#: ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "Nun s'especificó una unidá"
 
@@ -630,62 +889,58 @@ msgstr "Nun pudo atopase la unidá %s"
 msgid "Drive %s does not contain audio files"
 msgstr "La unidá %s nun caltién ficheros de soníu"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:439
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
 msgstr "CDDA montáu en %s"
 
-#: ../daemon/gvfsbackendcdda.c:440
-#: ../daemon/gvfsbackendcdda.c:960
-#: ../monitor/gdu/ggduvolume.c:337
-#: ../monitor/hal/ghalmount.c:325
-#: ../monitor/hal/ghalvolume.c:225
-#: ../monitor/hal/ghalvolume.c:246
+#: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
+#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
+#: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "Discu de soníu"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "El sistema de ficheros ta ocupáu: %d ficheru abiertu"
 msgstr[1] "El sistema de ficheros ta ocupáu: %d ficheros abiertos"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "El ficheru %s nun esiste na unidá %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "Fallu de «paranoia» na unidá %s"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "Fallu al guetar nel fluxu na unidá %s"
 
-#: ../daemon/gvfsbackendcdda.c:979
-#: ../daemon/gvfsbackendgphoto2.c:1885
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Nun esiste'l ficheru"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "El ficheru nun esiste o nun ye una pista de soníu"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "Serviciu de sistema de ficheros d'Audio CD"
 
-#: ../daemon/gvfsbackendcomputer.c:192
-#: ../daemon/gvfsbackendcomputer.c:756
+#: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
 msgstr "Equipu"
 
@@ -697,27 +952,22 @@ msgstr "Sistema de ficheros"
 msgid "Can't open mountable file"
 msgstr "Nun puede abrise'l ficheru montable"
 
-#: ../daemon/gvfsbackendcomputer.c:840
-#: ../daemon/gvfsbackendsftp.c:1146
+#: ../daemon/gvfsbackendcomputer.c:840 ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "Fallu internu: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:872
-#: ../daemon/gvfsbackendcomputer.c:991
+#: ../daemon/gvfsbackendcomputer.c:872 ../daemon/gvfsbackendcomputer.c:991
 msgid "Can't mount file"
 msgstr "Nun puede montase'l ficheru"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
-msgstr "Nun hai dengún sofitu na unidá"
-
-#: ../daemon/gvfsbackendcomputer.c:941
-#: ../daemon/gvfsbackendcomputer.c:1036
-#: ../daemon/gvfsbackendcomputer.c:1142
-#: ../daemon/gvfsbackendcomputer.c:1232
-#: ../daemon/gvfsbackendcomputer.c:1305
-#: ../daemon/gvfsbackendcomputer.c:1374
+msgid "No medium in the drive"
+msgstr "Nun hai un soporte na unidá"
+
+#: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
+#: ../daemon/gvfsbackendcomputer.c:1142 ../daemon/gvfsbackendcomputer.c:1232
+#: ../daemon/gvfsbackendcomputer.c:1305 ../daemon/gvfsbackendcomputer.c:1374
 msgid "Not a mountable file"
 msgstr "Nun ye un ficheru montable"
 
@@ -729,199 +979,159 @@ msgstr "Nun puede desmontase'l ficheru"
 msgid "Can't eject file"
 msgstr "Nun puede espulsase'l ficheru"
 
-#: ../daemon/gvfsbackendcomputer.c:1252
-#: ../daemon/gvfsbackendcomputer.c:1259
+#: ../daemon/gvfsbackendcomputer.c:1252 ../daemon/gvfsbackendcomputer.c:1259
 msgid "Can't start file"
 msgstr "Nun puede aniciase'l ficheru"
 
-#: ../daemon/gvfsbackendcomputer.c:1325
-#: ../daemon/gvfsbackendcomputer.c:1332
+#: ../daemon/gvfsbackendcomputer.c:1325 ../daemon/gvfsbackendcomputer.c:1332
 msgid "Can't stop file"
 msgstr "Nun puede parase'l ficheru"
 
-#: ../daemon/gvfsbackendcomputer.c:1389
-#: ../daemon/gvfsbackendcomputer.c:1396
+#: ../daemon/gvfsbackendcomputer.c:1389 ../daemon/gvfsbackendcomputer.c:1396
 msgid "Can't poll file"
 msgstr "Nun puede sondease'l ficheru"
 
-#: ../daemon/gvfsbackenddav.c:561
-#: ../daemon/gvfsbackenddav.c:1698
-#: ../daemon/gvfsbackendhttp.c:261
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+msgid "WebDAV as %s on %s%s"
+msgstr "WebDAV como %s en %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%s"
+msgstr "WebDAV en %s%s"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Fallu HTTP: %s"
 
-#: ../daemon/gvfsbackenddav.c:578
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Nun pudo analizase la rempuesta"
 
-#: ../daemon/gvfsbackenddav.c:587
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Rempuesta erma"
 
-#: ../daemon/gvfsbackenddav.c:595
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "Rempuesta inesperada del sirvidor"
 
-#: ../daemon/gvfsbackenddav.c:1214
-#: ../daemon/gvfsbackenddav.c:1838
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Rempuesta non válida"
 
-#: ../daemon/gvfsbackenddav.c:1357
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "Compartición WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "Introduza la contraseña pa %s"
 
-#: ../daemon/gvfsbackenddav.c:1362
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
 msgstr "Introduza la contraseña del proxy"
 
-#: ../daemon/gvfsbackenddav.c:1702
-#: ../daemon/gvfsbackenddav.c:1706
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "Nun ye una compartición activada WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1734
-#, c-format
-msgid "WebDAV on %s"
-msgstr "WebDAV en %s"
-
-#: ../daemon/gvfsbackenddav.c:1794
-#: ../daemon/gvfsbackenddav.c:1867
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "Nun pudo criase la petición"
 
-#: ../daemon/gvfsbackenddav.c:1930
-#: ../daemon/gvfsbackenddav.c:2183
-#: ../daemon/gvfsbackenddav.c:2294
-#: ../daemon/gvfsbackendftp.c:649
-#: ../daemon/gvfsbackendftp.c:830
-#: ../daemon/gvfsbackendftp.c:1180
-#: ../daemon/gvfsbackendftp.c:1358
-#: ../daemon/gvfsbackendsftp.c:4243
-#: ../daemon/gvfsbackendsmb.c:2038
-msgid "Target file already exists"
-msgstr "El ficheru destín yá esiste"
-
-#: ../daemon/gvfsbackenddav.c:2003
-#: ../daemon/gvfsbackendsftp.c:3377
-#: ../daemon/gvfsbackendsmb.c:1132
-msgid "The file was externally modified"
-msgstr "El ficheru modificóse esternamente"
-
-#: ../daemon/gvfsbackenddav.c:2034
-#: ../daemon/gvfsbackendsmb.c:1168
-#: ../daemon/gvfsbackendsmb.c:2055
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Falló la creación del ficheru de respaldu"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:486
-#: ../daemon/gvfsbackendnetwork.c:393
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
 msgstr "Rede llocal"
 
-#: ../daemon/gvfsbackenddnssd.c:730
-#: ../daemon/gvfsbackendnetwork.c:797
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "Nun puede monitorizase'l ficheru o direutoriu."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:748
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "DNS-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:749
-#: ../daemon/gvfsbackendnetwork.c:732
-#: ../daemon/gvfsbackendnetwork.c:882
-#: ../daemon/gvfsbackendnetwork.c:883
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "Rede"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:387
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "Introduza la contraseña pal ftp %s en %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "Pon contraseña pa FTP como %s en %s"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:390
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "Introduza la contraseña pal ftp en %s"
+msgid "Enter password for FTP on %s"
+msgstr "Pon contraseña pa FTP en %s"
 
-#: ../daemon/gvfsbackendftp.c:417
-#: ../daemon/gvfsbackendsftp.c:969
-#: ../daemon/gvfsbackendsmb.c:606
-#: ../daemon/gvfsbackendsmbbrowse.c:986
-msgid "Password dialog cancelled"
-msgstr "Encaboxóse'l diálogu de la contraseña"
-
-#: ../daemon/gvfsbackendftp.c:527
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ftp en %s"
+msgid "FTP on %s"
+msgstr "FTP en %s"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:531
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "%s nel ftp de %s"
+msgid "FTP as %s on %s"
+msgstr "FTP como %s en %s"
 
-#: ../daemon/gvfsbackendftp.c:624
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
 msgstr "Permisos insuficientes"
 
-#: ../daemon/gvfsbackendftp.c:670
-#: ../daemon/gvfsbackendsftp.c:2287
-#: ../daemon/gvfsbackendsftp.c:3023
-#: ../daemon/gvfsbackendsftp.c:3364
-#: ../daemon/gvfsbackendsftp.c:4234
-msgid "File is directory"
-msgstr "El ficheru ye un direutoriu"
-
-#: ../daemon/gvfsbackendftp.c:878
-#: ../daemon/gvfsbackendftp.c:1143
-#: ../daemon/gvfsbackendsftp.c:3230
-msgid "backups not supported yet"
-msgstr "les copies de respaldu nun tán sofitaes entá"
-
-#: ../daemon/gvfsbackendgphoto2.c:504
+#: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
 msgstr "%s: %d: El direutoriu o ficheru yá esiste"
 
-#: ../daemon/gvfsbackendgphoto2.c:511
+#: ../daemon/gvfsbackendgphoto2.c:513
 #, c-format
 msgid "%s: %d: No such file or directory"
 msgstr "%s: %d: El ficheru o direutoriu nun esiste"
 
-#: ../daemon/gvfsbackendgphoto2.c:517
+#: ../daemon/gvfsbackendgphoto2.c:519
 #, c-format
 msgid "%s: %d: Invalid filename"
 msgstr "%s: %d: Nome de ficheru non válidu"
 
-#: ../daemon/gvfsbackendgphoto2.c:523
+#: ../daemon/gvfsbackendgphoto2.c:525
 #, c-format
 msgid "%s: %d: Not Supported"
 msgstr "%s: %d: Non sofitáu"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:718
-#: ../daemon/gvfsbackendgphoto2.c:724
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "Cámara dixital (%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:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -929,183 +1139,176 @@ msgstr "Cámara %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:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "Reproductor de soníu %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:959
-#: ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:961
-#: ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Reproductor de soníu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1567
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Nun s'especificó'l preséu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1588
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Nun puede criase'l contestu gphoto2"
 
-#: ../daemon/gvfsbackendgphoto2.c:1598
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Fallu al criar la cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1611
-#: ../daemon/gvfsbackendgphoto2.c:1621
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Fallu al cargar la información del preséu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1633
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Fallu al guetar la información del preséu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1643
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Fallu al obtener la información del preséu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1656
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Fallu al afitar el puertu de comunicaciones de la cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1667
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Fallu al anicializar la cámara"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1681
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 montáu en %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1756
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Nun s'especificó denguna cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1797
-#: ../daemon/gvfsbackendgphoto2.c:1823
-#, c-format
-msgid "Filesystem is busy"
-msgstr "El sistema de ficheros ta ocupáu"
-
-#: ../daemon/gvfsbackendgphoto2.c:1893
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Fallu al criar el ficheru oxetu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1908
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Fallu al obtener el ficheru"
 
-#: ../daemon/gvfsbackendgphoto2.c:1918
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Fallu al obtener datos del ficheru"
 
-#: ../daemon/gvfsbackendgphoto2.c:1976
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Identificador d'iconu «%s» mal formáu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2052
-#: ../daemon/gvfsbackendgphoto2.c:3241
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Fallu al guetar nel fluxu na cámara %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2192
-#: ../daemon/gvfsbackendsftp.c:2906
-#: ../daemon/gvfsbackendsmbbrowse.c:1390
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Nun ye un direutoriu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2225
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Falló al obtener la llista de carpetes"
 
-#: ../daemon/gvfsbackendgphoto2.c:2291
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Falló al obtener la llista de ficheros"
 
-#: ../daemon/gvfsbackendgphoto2.c:2583
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Fallu al criar el direutoriu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2792
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "El nome yá esiste"
 
-#: ../daemon/gvfsbackendgphoto2.c:2803
-#: ../daemon/gvfsbackendgphoto2.c:3432
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "El nuevu nome ye mui llargu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2813
-#: ../daemon/gvfsbackendgphoto2.c:3443
-msgid "Error renaming dir"
-msgstr "Fallu al renomar el direutoriu"
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
+msgid "Error renaming directory"
+msgstr "Fallu al renomar la carpeta"
 
-#: ../daemon/gvfsbackendgphoto2.c:2826
-#: ../daemon/gvfsbackendgphoto2.c:3456
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Fallu al renomar el ficheru"
 
-#: ../daemon/gvfsbackendgphoto2.c:2890
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "El direutoriu «%s» nun ta baleru"
 
-#: ../daemon/gvfsbackendgphoto2.c:2901
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Fallu al desaniciar el direutoriu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2927
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Fallu al desaniciar el ficheru"
 
-#: ../daemon/gvfsbackendgphoto2.c:2980
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Nun puede escribise nel direutoriu"
 
-#: ../daemon/gvfsbackendgphoto2.c:3027
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Nun puede asignase'l nuevu ficheru nel qu'amestar"
 
-#: ../daemon/gvfsbackendgphoto2.c:3042
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Nun puede lleese'l ficheru nel qu'amestar"
 
-#: ../daemon/gvfsbackendgphoto2.c:3053
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Nun pueden obtener los datos del ficheru nel qu'amestar"
 
-#: ../daemon/gvfsbackendgphoto2.c:3340
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Fallu al escribir el ficheru"
 
-#: ../daemon/gvfsbackendgphoto2.c:3388
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Nun sofitáu (nun ye'l mesmu direutoriu)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3400
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Nun sofitáu (src ye un direutoriu, dst ye un direutoriu)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
+msgstr ""
+"Nun se permite (l'orixe ye un direutoriu, el destín tamién ye un direutoriu)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3408
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "Nun sofitáu (src ye un direutoriu, dst ye un ficheru esistente)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr ""
+"Nun se permite (l'orixe ye un direutoriu, pero'l destín ye un ficheru "
+"qu'existe)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3420
-msgid "Not supported (src is file, dst is dir)"
-msgstr "Nun sofitáu (src ye un ficheru, dst ye un direutoriu)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
+msgstr "Nun se permite (l'orixe ye un ficheru, pero'l destín ye un direutoriu)"
 
-#: ../daemon/gvfsbackendhttp.c:257
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "Fallu HTTP nel veceru: %s"
@@ -1115,14 +1318,13 @@ msgid "Directory notification not supported"
 msgstr "Nun se sofita la notificación de direutorios"
 
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:269
-#: ../daemon/gvfsbackendsmbbrowse.c:885
+#: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "Rede de Windows"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:931
+#: ../daemon/gvfsbackendnetwork.c:873
 msgid "Network Location Monitor"
 msgstr "Monitor d'allugamientu de rede"
 
@@ -1132,319 +1334,302 @@ msgstr "Monitor d'allugamientu de rede"
 #. 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:662
-#: ../daemon/gvfsbackendsmb.c:545
-#: ../daemon/gvfsbackendsmb.c:1417
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: ../daemon/gvfsbackendobexftp.c:871
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "Falta'l sofitu pa USB. Contaute col fabricante del software."
 
-#: ../daemon/gvfsbackendobexftp.c:991
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "Perdióse la conexón col preséu"
 
-#: ../daemon/gvfsbackendobexftp.c:1488
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "El preséu requier un anovamientu de software"
 
-#: ../daemon/gvfsbackendobexftp.c:1836
-#: ../daemon/gvfsbackendsmb.c:1929
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "Fallu al desaniciar el ficheru: %s"
 
-#: ../daemon/gvfsbackendsftp.c:295
-#: ../daemon/gvfsbackendsftp.c:651
+#: ../daemon/gvfsbackendsftp.c:302 ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "el programa de ssh finó de sópitu"
 
-#: ../daemon/gvfsbackendsftp.c:303
-#: ../daemon/gvfsbackendsftp.c:1788
-#: ../daemon/gvfsftptask.c:400
-msgid "Permission denied"
-msgstr "Permisu denegáu"
-
-#: ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:317
 msgid "Hostname not known"
 msgstr "El nome de sirvidor desconocíu"
 
-#: ../daemon/gvfsbackendsftp.c:317
+#: ../daemon/gvfsbackendsftp.c:324
 msgid "No route to host"
 msgstr "Nun hai un camín al sirvidor"
 
-#: ../daemon/gvfsbackendsftp.c:324
+#: ../daemon/gvfsbackendsftp.c:331
 msgid "Connection refused by server"
 msgstr "El sirvidor refugó la conexón"
 
-#: ../daemon/gvfsbackendsftp.c:331
+#: ../daemon/gvfsbackendsftp.c:338
 msgid "Host key verification failed"
 msgstr "Falló la verificación de la contraseña del sirvidor"
 
-#: ../daemon/gvfsbackendsftp.c:495
+#: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
 msgstr "Nun pudo llanzase'l programa ssh"
 
-#: ../daemon/gvfsbackendsftp.c:511
+#: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "Nun pudo llanzase'l programa ssh: %s"
 
-#: ../daemon/gvfsbackendsftp.c:613
-#: ../daemon/gvfsbackendsftp.c:874
+#: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "Expiró el tiempu p'aniciar la sesión"
 
-#: ../daemon/gvfsbackendsftp.c:953
-msgid "Enter passphrase for key"
-msgstr "Introduz una frase de pasu pa la contraseña"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:958
+#, c-format
+msgid "Enter passphrase for key for ssh as %s on %s"
+msgstr "Escribir la contraseña pa la clave ssh como %s en %s"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:961
+#, c-format
+msgid "Enter password for ssh as %s on %s"
+msgstr "Escribir la contraseña pa ssh como %s en %s"
 
-#: ../daemon/gvfsbackendsftp.c:955
-msgid "Enter password"
-msgstr "Introduz la contraseña"
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:965
+#, c-format
+msgid "Enter passphrase for key for ssh on %s"
+msgstr "Escribir la contraseña pa la clave ssh en %s"
 
-#: ../daemon/gvfsbackendsftp.c:1031
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:968
+#, c-format
+msgid "Enter password for ssh on %s"
+msgstr "Escribir la contraseña pa ssh en %s"
+
+#: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
 msgstr "Nun puede unviase la contraseña"
 
-#: ../daemon/gvfsbackendsftp.c:1039
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
 msgstr "Aniciar sesión de toes formes"
 
-#: ../daemon/gvfsbackendsftp.c:1039
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
 msgstr "Encaboxar aniciu de sesión"
 
-#: ../daemon/gvfsbackendsftp.c:1048
+#: ../daemon/gvfsbackendsftp.c:1065
 #, c-format
 msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is %s. If you want to be absolutely "
+"sure it is safe to continue, contact the system administrator."
 msgstr ""
 "Desconozse la identidá del equipu remotu (%s).\n"
-"Esto asocede cuando anicia sesión per primer vegada nún equipu.\n"
+"Esto asocede cuando anicies sesión per primer vegada nun equipu.\n"
 "\n"
-"La identidá unviada pol equipu remotu ye %s. Contaute col alministrador del sistema si quies tar daveres seguru de que ye seguru siguir."
+"La identidá unviada pol equipu remotu ye %s. Contauta col alministrador del "
+"sistema si quies tar daveres seguru de que ye seguro siguir."
 
-#: ../daemon/gvfsbackendsftp.c:1068
+#: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
 msgstr "Encaboxóse l'aniciu de sesión"
 
-#: ../daemon/gvfsbackendsftp.c:1088
+#: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
 msgstr "Nun puede unviase la confirmación d'identidá del equipu"
 
-#: ../daemon/gvfsbackendsftp.c:1615
-#: ../daemon/gvfsbackendsftp.c:1638
+#: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
 msgstr "Fallu de protocolu"
 
-#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1663
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp for %s on %s"
-msgstr "sftp pa %s en %s"
+msgid "SFTP for %s on %s"
+msgstr "SFTP pa %s en %s"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1666
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
-msgid "sftp on %s"
-msgstr "sftp en %s"
+msgid "SFTP on %s"
+msgstr "SFTP en %s"
 
-#: ../daemon/gvfsbackendsftp.c:1704
+#: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "Nun pudo atopase'l comandu ssh sofitáu"
 
-#: ../daemon/gvfsbackendsftp.c:1963
-#: ../daemon/gvfsbackendsftp.c:2352
-#: ../daemon/gvfsbackendsftp.c:2431
-#: ../daemon/gvfsbackendsftp.c:2442
-#: ../daemon/gvfsbackendsftp.c:2498
-#: ../daemon/gvfsbackendsftp.c:2584
-#: ../daemon/gvfsbackendsftp.c:2634
-#: ../daemon/gvfsbackendsftp.c:2680
-#: ../daemon/gvfsbackendsftp.c:2755
-#: ../daemon/gvfsbackendsftp.c:2862
-#: ../daemon/gvfsbackendsftp.c:2979
-#: ../daemon/gvfsbackendsftp.c:3060
-#: ../daemon/gvfsbackendsftp.c:3132
-#: ../daemon/gvfsbackendsftp.c:3144
-#: ../daemon/gvfsbackendsftp.c:3202
-#: ../daemon/gvfsbackendsftp.c:3244
-#: ../daemon/gvfsbackendsftp.c:3429
-#: ../daemon/gvfsbackendsftp.c:3461
-#: ../daemon/gvfsbackendsftp.c:3516
-#: ../daemon/gvfsbackendsftp.c:3573
-#: ../daemon/gvfsbackendsftp.c:3870
-#: ../daemon/gvfsbackendsftp.c:3937
-#: ../daemon/gvfsbackendsftp.c:4072
-#: ../daemon/gvfsbackendsftp.c:4132
-#: ../daemon/gvfsbackendsftp.c:4167
-#: ../daemon/gvfsbackendsftp.c:4195
-#: ../daemon/gvfsbackendsftp.c:4303
-#: ../daemon/gvfsbackendsftp.c:4357
-#: ../daemon/gvfsbackendsftp.c:4396
-#: ../daemon/gvfsbackendsftp.c:4430
-#: ../daemon/gvfsbackendsftp.c:4464
-#: ../daemon/gvfsbackendsftp.c:4479
-#: ../daemon/gvfsbackendsftp.c:4494
-#: ../daemon/gvfsbackendsftp.c:4572
+#: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544 ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680 ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "Recibióse una rempuesta non válida"
 
-#: ../daemon/gvfsbackendsftp.c:2211
-#: ../daemon/gvfsbackendsmb.c:1424
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
 msgstr " (codificación non válida)"
 
-#: ../daemon/gvfsbackendsftp.c:2296
+#: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
 msgstr "Fallu"
 
-#: ../daemon/gvfsbackendsftp.c:2404
+#: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
 msgstr "Identificador d'iconu «%s» non válidu en OpenIconForRead"
 
-#: ../daemon/gvfsbackendsftp.c:2700
+#: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "Error al criar el ficheru de respaldu: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3306
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "Nun pudo criase'l ficheru temporal"
 
-#: ../daemon/gvfsbackendsftp.c:4229
-#: ../daemon/gvfsbackendsmb.c:2027
-msgid "Can't move directory over directory"
-msgstr "Nun puede movese un direutoriu sobro un direutoriu"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "Requiese contraseña pa %s"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "Comparticiones Windows en %s"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "Falló al obtener la llista de compartición del sirvidor"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "Nun ye un ficheru regular"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Serviciu del sistema de ficheros de rede de Windows"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:229
+#: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
 msgstr "Requierse contraseña pa la compartición %s en %s"
 
-#: ../daemon/gvfsbackendsmb.c:485
-#: ../daemon/gvfsbackendsmb.c:531
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "Fallu internu (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:611
+#: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
 msgstr "Falló al montar la compartición Windows"
 
-#: ../daemon/gvfsbackendsmb.c:772
-#: ../daemon/gvfsbackendsmb.c:1268
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "Triba de gueta non sofitada"
 
-#: ../daemon/gvfsbackendsmb.c:1360
+#: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "Falló la creación del ficheru de respaldu: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2003
+#: ../daemon/gvfsbackendsmb.c:1734
+msgid "Invalid attribute type (uint64 expected)"
+msgstr "Triba d'atributu non válida (esperábase uint64)"
+
+#: ../daemon/gvfsbackendsmb.c:1922
+msgid "Can't rename file, filename already exists"
+msgstr "Nun se puede renomar el ficheru, el nome yá existe"
+
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Fallu al mover el ficheru: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2075
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Fallu al desaniciar el ficheru destín: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2099
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Nun puede movese recursivamente un direutoriu"
 
-#: ../daemon/gvfsbackendsmb.c:2165
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
 msgstr "Serviciu del sistema de ficheros compartíos de Windows"
 
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:365
-#, c-format
-msgid "Password required for %s"
-msgstr "Requiese contraseña pa %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:893
-#, c-format
-msgid "Windows shares on %s"
-msgstr "Comparticiones Windows en %s"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:992
-msgid "Failed to retrieve share list from server"
-msgstr "Falló al obtener la llista de compartición del sirvidor"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1080
-#: ../daemon/gvfsbackendsmbbrowse.c:1126
-msgid "The file is not a mountable"
-msgstr "El ficheru nun puede montase"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1148
-msgid "Not a regular file"
-msgstr "Nun ye un ficheru regular"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1503
-msgid "Windows Network Filesystem Service"
-msgstr "Serviciu del sistema de ficheros de rede de Windows"
-
-#: ../daemon/gvfsbackendtrash.c:370
-#: ../daemon/gvfsbackendtrash.c:426
+#: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "Nun puede desaniciase la carpeta de la papelera"
 
-#: ../daemon/gvfsbackendtrash.c:387
-#: ../daemon/gvfsbackendtrash.c:440
+#: ../daemon/gvfsbackendtrash.c:387 ../daemon/gvfsbackendtrash.c:440
 msgid "Items in the trash may not be modified"
 msgstr "Los elementos na papelera nun han camudase"
 
 #. Translators: this is the display name of the backend
 #. translators: This is the name of the backend
-#: ../daemon/gvfsbackendtrash.c:742
-#: ../daemon/gvfsbackendtrash.c:850
+#: ../daemon/gvfsbackendtrash.c:742 ../daemon/gvfsbackendtrash.c:850
 msgid "Trash"
 msgstr "Papelera"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Triba de backend non válida"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
+msgid "Error sending file descriptor: %s"
 msgstr "Fallu al unviar el descriptor de ficheru: %s"
 
-#: ../daemon/gvfsftpconnection.c:181
+#: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
 msgstr "Final de fluxu inesperáu"
 
-#: ../daemon/gvfsftpconnection.c:197
-#: ../daemon/gvfsftpconnection.c:210
-#: ../daemon/gvfsftptask.c:412
-#: ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Rempuesta incorreuta"
 
-#: ../daemon/gvfsftpconnection.c:393
-msgid "Failed to create active FTP connection. Maybe your router does not support this?"
-msgstr "Falló al criar la conexón FTP activa. ¿Seique'l so router nun lo sofita?"
+#: ../daemon/gvfsftpconnection.c:392
+msgid ""
+"Failed to create active FTP connection. Maybe your router does not support "
+"this?"
+msgstr ""
+"Falló al criar la conexón FTP activa. ¿Seique'l so router nun lo sofita?"
 
-#: ../daemon/gvfsftpconnection.c:400
+#: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
 msgstr "Falló al criar la conexón FTP activa."
 
@@ -1452,48 +1637,49 @@ msgstr "Falló al criar la conexón FTP activa."
 msgid "Filename contains invalid characters."
 msgstr "El nome de ficheru caltién carauteres non válidos."
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "El sirvidor FTP ta ocupáu. Inténtelo de nuevu más sero."
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "Les cuentes nun tán sofitaes"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "El sirvidor zarró la conexón"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr "Nun puede abrise la conexón de datos. ¿Seique'l so torgafueos tea torgándolo?"
+msgstr ""
+"Nun puede abrise la conexón de datos. ¿Seique'l so torgafueos tea "
+"torgándolo?"
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Conexón de datos zarrada"
 
-#: ../daemon/gvfsftptask.c:375
-#: ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "Falló la operación"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Nun hai espaciu llibre nel sirvidor"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Protocolu de rede non sofitáu"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Triba de páxina desconocida"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Nome de ficheru non válidu"
 
-#: ../daemon/gvfsjobmakesymlink.c:126
+#: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
 msgstr "El backend nun sofita enllaces simbólicos"
 
@@ -1501,8 +1687,11 @@ msgstr "El backend nun sofita enllaces simbólicos"
 msgid "Invalid dbus message"
 msgstr "Mensax de D-Bus non válidu"
 
-#: ../daemon/main.c:45
-#: ../metadata/meta-daemon.c:694
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "El sistema de ficheros ta ocupáu"
+
+#: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
 msgstr "Trocar el degorriu antiguu."
 
@@ -1510,41 +1699,35 @@ msgstr "Trocar el degorriu antiguu."
 msgid "Don't start fuse."
 msgstr "Nun aniciar fuse."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "Degorriu GVFS"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "Degorriu principal pa GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76
-#: ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78
-#: ../metadata/meta-daemon.c:720
-#: ../programs/gvfs-cat.c:163
-#: ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:110
-#: ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392
-#: ../programs/gvfs-mkdir.c:59
-#: ../programs/gvfs-move.c:98
-#: ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153
-#: ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
+#: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
+#: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
+#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
 #: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Intente \"%s --help\" pa obtener más información."
 
-#: ../daemon/mount.c:459
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
 msgstr "Argumentos non válidos pal fíu llanzáu"
 
@@ -1553,39 +1736,34 @@ msgstr "Argumentos non válidos pal fíu llanzáu"
 msgid "Automount failed: %s"
 msgstr "Falló automount: %s"
 
-#: ../daemon/mount.c:824
-#: ../daemon/mount.c:898
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "L'allugamientu especificáu nun ta montáu"
 
-#: ../daemon/mount.c:829
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "L'allugamientu especificáu nun ta sofitáu"
 
-#: ../daemon/mount.c:1036
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "L'allugamientu yá ta montáu"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "L'allugamientu nun ye montable"
 
-#: ../metadata/meta-daemon.c:130
-#: ../metadata/meta-daemon.c:336
-#: ../metadata/meta-daemon.c:390
-#: ../metadata/meta-daemon.c:419
+#: ../metadata/meta-daemon.c:130 ../metadata/meta-daemon.c:336
+#: ../metadata/meta-daemon.c:390 ../metadata/meta-daemon.c:419
 #: ../metadata/meta-daemon.c:449
 #, c-format
 msgid "Can't find metadata file %s"
 msgstr "Nun puede atopase'l ficheru de metadatos %s"
 
-#: ../metadata/meta-daemon.c:160
-#: ../metadata/meta-daemon.c:179
+#: ../metadata/meta-daemon.c:160 ../metadata/meta-daemon.c:179
 msgid "Unable to set metadata key"
 msgstr "Nun puede afitase la contraseña de metadatos"
 
-#: ../metadata/meta-daemon.c:197
-#: ../metadata/meta-daemon.c:399
+#: ../metadata/meta-daemon.c:197 ../metadata/meta-daemon.c:399
 msgid "Unable to unset metadata key"
 msgstr "Nun puede desestablecese la contraseña de metadatos"
 
@@ -1609,56 +1787,57 @@ msgstr "Degorriu de metadatos pa GVFS"
 msgid "GVfs GDU Volume Monitor"
 msgstr "Monitor de volúmenes GDU de GVfs"
 
-#: ../monitor/gdu/ggdudrive.c:168
-#: ../monitor/hal/ghaldrive.c:179
+#: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
 msgstr "Disquín"
 
-#: ../monitor/gdu/ggdudrive.c:256
+#: ../monitor/gdu/ggdudrive.c:258
 #, c-format
 msgid "Unnamed Drive (%s)"
 msgstr "Unidá ensin nome (%s)"
 
-#: ../monitor/gdu/ggdudrive.c:258
+#: ../monitor/gdu/ggdudrive.c:260
 msgid "Unnamed Drive"
 msgstr "Unidá ensin nome"
 
-#: ../monitor/gdu/ggdudrive.c:559
-#: ../monitor/hal/ghaldrive.c:662
+#: ../monitor/gdu/ggdudrive.c:561
 #, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
-msgstr "Falló al espulsar el mediu, ún o más volúmenes tán ocupados nel mediu."
+msgid "Failed to eject medium; one or more volumes on the medium are busy."
+msgstr "Falló al espulsar el mediu; ún o más volúmenes tán ocupaos nel mediu."
 
-#: ../monitor/gdu/ggdudrive.c:1014
+#: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
-"Starting a drive in degraded mode means that the drive is no longer tolerant to failures. Data on the drive may be irrevocably lost if a component fails."
+"Starting a drive in degraded mode means that the drive is no longer tolerant "
+"to failures. Data on the drive may be irrevocably lost if a component fails."
 msgstr ""
 "¿Aniciar la unidá en mou degradáu?\n"
-"Aniciar una unidá en mou degradáu significa que la unidá nun tien tolerancia a fallos. Los datos na unidá pueden perdese ensin vuelta si un componente falla."
+"Aniciar una unidá en mou degradáu significa que la unidá nun tien tolerancia "
+"a fallos. Los datos na unidá pueden perdese ensin vuelta si un componente "
+"falla."
 
-#: ../monitor/gdu/ggdudrive.c:1020
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "Aniciar de toes formes"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Ún o más programes eviten la operación de desmontáu."
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "Nun puede obtenese l'esclavu LUKS en testu claru"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Nun puede obtenese l'esclavu LUKS en testu claru dende'l camín «%s»"
 
-#: ../monitor/gdu/ggduvolume.c:325
+#: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
 msgstr "Disquín"
 
-#: ../monitor/gdu/ggduvolume.c:1075
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1667,7 +1846,7 @@ msgstr ""
 "Introducir una contraseña pa desbloquiar el volume\n"
 "El preséu «%s» caltién datos cifraos na partición %d."
 
-#: ../monitor/gdu/ggduvolume.c:1082
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1676,7 +1855,7 @@ msgstr ""
 "Introducir una contraseña pa desbloquiar el volume\n"
 "El preséu «%s» tien datos cifraos."
 
-#: ../monitor/gdu/ggduvolume.c:1089
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1685,177 +1864,141 @@ msgstr ""
 "Introducir una contraseña pa desbloquiar el volume\n"
 "El preséu %s tien datos cifraos."
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "CD-ROM Disc"
 msgstr "Discu CD-ROM"
 
-#: ../monitor/gphoto2/hal-utils.c:40
-#: ../monitor/hal/hal-utils.c:40
+#: ../monitor/gphoto2/hal-utils.c:40 ../monitor/hal/hal-utils.c:40
 msgid "Blank CD-ROM Disc"
 msgstr "Discu CD-ROM virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "CD-R Disc"
 msgstr "Discu CD-R"
 
-#: ../monitor/gphoto2/hal-utils.c:41
-#: ../monitor/hal/hal-utils.c:41
+#: ../monitor/gphoto2/hal-utils.c:41 ../monitor/hal/hal-utils.c:41
 msgid "Blank CD-R Disc"
 msgstr "Discu CD-R virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "CD-RW Disc"
 msgstr "Discu CD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:42
-#: ../monitor/hal/hal-utils.c:42
+#: ../monitor/gphoto2/hal-utils.c:42 ../monitor/hal/hal-utils.c:42
 msgid "Blank CD-RW Disc"
 msgstr "Discu CD-RW virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "DVD-ROM Disc"
 msgstr "Discu DVD-ROM"
 
-#: ../monitor/gphoto2/hal-utils.c:43
-#: ../monitor/gphoto2/hal-utils.c:45
-#: ../monitor/hal/hal-utils.c:43
-#: ../monitor/hal/hal-utils.c:45
+#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
 msgid "Blank DVD-ROM Disc"
 msgstr "Discu DVD-ROM virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "DVD-RAM Disc"
 msgstr "Discu DVD-RAM"
 
-#: ../monitor/gphoto2/hal-utils.c:44
-#: ../monitor/hal/hal-utils.c:44
+#: ../monitor/gphoto2/hal-utils.c:44 ../monitor/hal/hal-utils.c:44
 msgid "Blank DVD-RAM Disc"
 msgstr "Discu DVD-RAM virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "DVD-RW Disc"
 msgstr "Discu DVD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:46
-#: ../monitor/hal/hal-utils.c:46
+#: ../monitor/gphoto2/hal-utils.c:46 ../monitor/hal/hal-utils.c:46
 msgid "Blank DVD-RW Disc"
 msgstr "Discu DVD-RW virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "DVD+R Disc"
 msgstr "Discu DVD+R"
 
-#: ../monitor/gphoto2/hal-utils.c:47
-#: ../monitor/hal/hal-utils.c:47
+#: ../monitor/gphoto2/hal-utils.c:47 ../monitor/hal/hal-utils.c:47
 msgid "Blank DVD+R Disc"
 msgstr "Discu DVD+R virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "DVD+RW Disc"
 msgstr "Discu DVD+RW"
 
-#: ../monitor/gphoto2/hal-utils.c:48
-#: ../monitor/hal/hal-utils.c:48
+#: ../monitor/gphoto2/hal-utils.c:48 ../monitor/hal/hal-utils.c:48
 msgid "Blank DVD+RW Disc"
 msgstr "Discu DVD+RW virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "DVD+R DL Disc"
 msgstr "Discu DVD+R DL"
 
-#: ../monitor/gphoto2/hal-utils.c:49
-#: ../monitor/hal/hal-utils.c:49
+#: ../monitor/gphoto2/hal-utils.c:49 ../monitor/hal/hal-utils.c:49
 msgid "Blank DVD+R DL Disc"
 msgstr "Discu DVD+R DL virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blu-Ray Disc"
 msgstr "Discu Blu-Ray"
 
-#: ../monitor/gphoto2/hal-utils.c:50
-#: ../monitor/hal/hal-utils.c:50
+#: ../monitor/gphoto2/hal-utils.c:50 ../monitor/hal/hal-utils.c:50
 msgid "Blank Blu-Ray Disc"
 msgstr "Discu Blu-Ray virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blu-Ray R Disc"
 msgstr "Discu Blu-Ray R"
 
-#: ../monitor/gphoto2/hal-utils.c:51
-#: ../monitor/hal/hal-utils.c:51
+#: ../monitor/gphoto2/hal-utils.c:51 ../monitor/hal/hal-utils.c:51
 msgid "Blank Blu-Ray R Disc"
 msgstr "Discu Blu-Ray R virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blu-Ray RW Disc"
 msgstr "Discu Blu-Ray RW"
 
-#: ../monitor/gphoto2/hal-utils.c:52
-#: ../monitor/hal/hal-utils.c:52
+#: ../monitor/gphoto2/hal-utils.c:52 ../monitor/hal/hal-utils.c:52
 msgid "Blank Blu-Ray RW Disc"
 msgstr "Discu Blu-Ray RW virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "HD DVD Disc"
 msgstr "Discu HD DVD"
 
-#: ../monitor/gphoto2/hal-utils.c:53
-#: ../monitor/hal/hal-utils.c:53
+#: ../monitor/gphoto2/hal-utils.c:53 ../monitor/hal/hal-utils.c:53
 msgid "Blank HD DVD Disc"
 msgstr "Discu DVD HD virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "HD DVD-R Disc"
 msgstr "Discu HD DVD-R"
 
-#: ../monitor/gphoto2/hal-utils.c:54
-#: ../monitor/hal/hal-utils.c:54
+#: ../monitor/gphoto2/hal-utils.c:54 ../monitor/hal/hal-utils.c:54
 msgid "Blank HD DVD-R Disc"
 msgstr "Discu HD DVD-R virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "HD DVD-RW Disc"
 msgstr "Discu DVD-RW"
 
-#: ../monitor/gphoto2/hal-utils.c:55
-#: ../monitor/hal/hal-utils.c:55
+#: ../monitor/gphoto2/hal-utils.c:55 ../monitor/hal/hal-utils.c:55
 msgid "Blank HD DVD-RW Disc"
 msgstr "Discu HD DVD-RW virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "MO Disc"
 msgstr "Discu MO"
 
-#: ../monitor/gphoto2/hal-utils.c:56
-#: ../monitor/hal/hal-utils.c:56
+#: ../monitor/gphoto2/hal-utils.c:56 ../monitor/hal/hal-utils.c:56
 msgid "Blank MO Disc"
 msgstr "Discu MO virxe"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Disc"
 msgstr "Discu"
 
-#: ../monitor/gphoto2/hal-utils.c:57
-#: ../monitor/hal/hal-utils.c:57
+#: ../monitor/gphoto2/hal-utils.c:57 ../monitor/hal/hal-utils.c:57
 msgid "Blank Disc"
 msgstr "Discu virxe"
 
@@ -1997,36 +2140,35 @@ msgstr "Unidá Thumb"
 msgid "Mass Storage Drive"
 msgstr "Unidá d'atroxu masivu"
 
-#: ../monitor/hal/ghalmount.c:159
-#: ../monitor/hal/ghalvolume.c:163
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+msgid "Failed to eject media; one or more volumes on the media are busy."
+msgstr "Falló al espulsar el mediu, ún o más volúmenes tán ocupados nel mediu."
+
+#: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f KiB"
 
-#: ../monitor/hal/ghalmount.c:164
-#: ../monitor/hal/ghalvolume.c:168
+#: ../monitor/hal/ghalmount.c:164 ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MiB"
 
-#: ../monitor/hal/ghalmount.c:169
-#: ../monitor/hal/ghalvolume.c:173
+#: ../monitor/hal/ghalmount.c:169 ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GiB"
 
-#: ../monitor/hal/ghalmount.c:323
-#: ../monitor/hal/ghalvolume.c:244
+#: ../monitor/hal/ghalmount.c:323 ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
 msgstr "Discu de soníu y datos"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalmount.c:336
-#: ../monitor/hal/ghalvolume.c:255
 #, c-format
-msgid "%s Media"
-msgstr "Sofitu de %s"
+msgid "%s Medium"
+msgstr "Soporte %s"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -2034,6 +2176,12 @@ msgstr "Sofitu de %s"
 msgid "%s Encrypted Data"
 msgstr "Datos cifraos de %s"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "Sofitu de %s"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
 msgstr "allugamientos"
@@ -2073,22 +2221,30 @@ msgstr "ALLUGAMIENTU… - concatenar los ALLUGAMIENTOS con una salida standard."
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
 #: ../programs/gvfs-cat.c:141
-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."
-msgstr "Concatenar ficheros n'allugamientos ya imprentalos na salida standard. Furrula igual que la utilidá tradicional «cat», pero usando l'allugamientu gvfs n'arróu de los ficheros llocales: por exemplu, puede usar daqué como smb://sirvidor/recursu/ficheru.txt como un allugamientu pa concatenar."
+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."
+msgstr ""
+"Concatenar ficheros n'allugamientos ya imprentalos na salida standard. "
+"Furrula igual que la utilidá tradicional «cat», pero usando l'allugamientu "
+"gvfs n'arróu de los ficheros llocales: por exemplu, puede usar daqué como "
+"smb://sirvidor/recursu/ficheru.txt como un allugamientu pa concatenar."
 
 #: ../programs/gvfs-cat.c:148
-msgid "Note: just pipe through cat if you need its formatting option like -n, -T or other."
-msgstr "Nota: use una tubería a traviés de «cat» si necesita les opciones de formatéu tales como -n, -T u otres."
-
-#: ../programs/gvfs-cat.c:161
-#: ../programs/gvfs-copy.c:108
-#: ../programs/gvfs-info.c:369
-#: ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mkdir.c:57
-#: ../programs/gvfs-move.c:96
-#: ../programs/gvfs-open.c:138
-#: ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126
+msgid ""
+"Note: just pipe through cat if you need its formatting option like -n, -T or "
+"other."
+msgstr ""
+"Nota: use una tubería a traviés de «cat» si necesita les opciones de "
+"formatéu tales como -n, -T u otres."
+
+#: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
+#: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
+#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
 #: ../programs/gvfs-tree.c:249
 #, c-format
 msgid "Error parsing commandline options: %s\n"
@@ -2096,24 +2252,20 @@ msgstr "Fallu al analizar les opciones de la llinia de comandos: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174
-#: ../programs/gvfs-open.c:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: falten allugamientos"
 
-#: ../programs/gvfs-copy.c:44
-#: ../programs/gvfs-move.c:42
+#: ../programs/gvfs-copy.c:44 ../programs/gvfs-move.c:42
 msgid "no target directory"
 msgstr "ensin direutoriu de destín"
 
-#: ../programs/gvfs-copy.c:45
-#: ../programs/gvfs-move.c:43
+#: ../programs/gvfs-copy.c:45 ../programs/gvfs-move.c:43
 msgid "show progress"
 msgstr "amosar progresu"
 
-#: ../programs/gvfs-copy.c:46
-#: ../programs/gvfs-move.c:44
+#: ../programs/gvfs-copy.c:46 ../programs/gvfs-move.c:44
 msgid "prompt before overwrite"
 msgstr "entrugar enantes de sobroscribir"
 
@@ -2121,8 +2273,7 @@ msgstr "entrugar enantes de sobroscribir"
 msgid "preserve all attributes"
 msgstr "caltener tolos atributos"
 
-#: ../programs/gvfs-copy.c:48
-#: ../programs/gvfs-move.c:45
+#: ../programs/gvfs-copy.c:48 ../programs/gvfs-move.c:45
 msgid "backup existing destination files"
 msgstr "respaldar los ficheros de destín esistentes"
 
@@ -2130,42 +2281,34 @@ msgstr "respaldar los ficheros de destín esistentes"
 msgid "never follow symbolic links"
 msgstr "enxamás siguir enllaces simbólicos"
 
-#: ../programs/gvfs-copy.c:78
-#: ../programs/gvfs-move.c:67
+#: ../programs/gvfs-copy.c:78 ../programs/gvfs-move.c:67
 #, c-format
 msgid "progress"
 msgstr "progresu"
 
-#: ../programs/gvfs-copy.c:101
-#: ../programs/gvfs-move.c:89
-#: ../programs/gvfs-save.c:156
-msgid "- output files at <location>"
-msgstr "- mover los ficheros a <location>"
+#: ../programs/gvfs-copy.c:115
+msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
+msgstr "ORIXE... DESTÍN: copiar ficheru(os) de ORIXE a DESTÍN"
 
-#: ../programs/gvfs-copy.c:119
-#: ../programs/gvfs-move.c:107
-#, c-format
+#: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
 msgid "Missing operand\n"
 msgstr "Falten operandos\n"
 
-#: ../programs/gvfs-copy.c:127
-#: ../programs/gvfs-move.c:115
-#, c-format
+#: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
 msgid "Too many arguments\n"
 msgstr "Abondos argumentos\n"
 
-#: ../programs/gvfs-copy.c:136
-#: ../programs/gvfs-move.c:124
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "El destín %s nun ye un direutoriu\n"
 
-#: ../programs/gvfs-copy.c:177
+#: ../programs/gvfs-copy.c:193
 #, c-format
 msgid "overwrite %s?"
 msgstr "¿sobroscribir %s?"
 
-#: ../programs/gvfs-copy.c:191
+#: ../programs/gvfs-copy.c:207
 #, c-format
 msgid "Error copying file %s: %s\n"
 msgstr "Fallu al copiar el ficheru %s: %s\n"
@@ -2178,13 +2321,11 @@ msgstr "Llista de los atributos escribibles"
 msgid "Get filesystem info"
 msgstr "Obtener la información del sistema de ficheros"
 
-#: ../programs/gvfs-info.c:39
-#: ../programs/gvfs-ls.c:39
+#: ../programs/gvfs-info.c:39 ../programs/gvfs-ls.c:39
 msgid "The attributes to get"
 msgstr "Los atributos pa obtener"
 
-#: ../programs/gvfs-info.c:40
-#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-info.c:40 ../programs/gvfs-ls.c:43
 #: ../programs/gvfs-set-attribute.c:37
 msgid "Don't follow symlinks"
 msgstr "Nun siguir enllaces simbólicos"
@@ -2283,8 +2424,7 @@ msgstr "Espacios de nomes de los atributos escribibles:\n"
 msgid "- show info for <location>"
 msgstr "- amosar información pa <location>"
 
-#: ../programs/gvfs-ls.c:40
-#: ../programs/gvfs-tree.c:36
+#: ../programs/gvfs-ls.c:40 ../programs/gvfs-tree.c:36
 msgid "Show hidden files"
 msgstr "Amosar ficheros anubríos"
 
@@ -2296,9 +2436,8 @@ msgstr "Usar formatu de llista llarga"
 msgid "Show completions"
 msgstr "Amosar opciones de completáu"
 
-#: ../programs/gvfs-ls.c:164
-#: ../programs/gvfs-ls.c:171
-#: ../programs/gvfs-rename.c:68
+#: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
+#: ../programs/gvfs-rename.c:69
 #, c-format
 msgid "Error: %s\n"
 msgstr "Error: %s\n"
@@ -2307,20 +2446,74 @@ msgstr "Error: %s\n"
 msgid "- list files at <location>"
 msgstr "- llistar los ficheros en <location>"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "Remanador de consultes pa triba mime"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "Afitar el remanador de consultes pa triba mime"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "- consiguir/afitar el remanador pa <mimetype>"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "Especifica ún de --query y --set"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "Tienes d'especificar una triba mime única.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "Tienes d'especificar la triba mime siguida del remanador predetermináu.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "Nun hai aplicación predeterminada pa «%s»\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "Aplicación predeterminada pa «%s»: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "Aplicaciones registraes:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "Fallu al cargar la información pal remanador «%s»\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "Fallu al afitar «%s» como remanador predetermináu pa «%s»: %s\n"
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
 msgstr "criar direutorios padre"
 
-#: ../programs/gvfs-mkdir.c:50
+#: ../programs/gvfs-mkdir.c:51
 msgid "- create directories"
 msgstr "- crear direutorios"
 
-#: ../programs/gvfs-mkdir.c:78
-#: ../programs/gvfs-mkdir.c:86
+#: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
 msgstr "Fallu al criar el direutoriu: %s\n"
 
+#: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
+msgid "Don't send single MOVED events."
+msgstr "Nun unviar eventos MOVED individuales."
+
 #: ../programs/gvfs-mount.c:54
 msgid "Mount as mountable"
 msgstr "Montar como montable"
@@ -2337,54 +2530,58 @@ msgstr "Desmontar"
 msgid "Unmount all mounts with the given scheme"
 msgstr "Desmontar tolos puntos montaos col esquema proporcionáu"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
 msgstr "Llista"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
 msgstr "Amosar información adicional pa Llista y Monitorizar"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
 msgstr "Monitorizar eventos"
 
-#: ../programs/gvfs-mount.c:163
-#: ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "Fallu al montar l'allugamientu: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "Fallu al desmontar el puntu de montaxe: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Fallu al atopar el montaxe axuntu: %s\n"
 
-#: ../programs/gvfs-mount.c:682
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Fallu al montar %s: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s montáu en %s\n"
 
-#: ../programs/gvfs-mount.c:747
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Nun esiste un volume pal ficheru de preséu %s\n"
 
-#: ../programs/gvfs-mount.c:938
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- montar <allugamientu>"
 
-#: ../programs/gvfs-move.c:173
+#: ../programs/gvfs-move.c:103
+msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
+msgstr "ORIXE... DESTÍN: mover ficheru(os) de ORIXE a DESTÍN"
+
+#: ../programs/gvfs-move.c:189
 #, c-format
 msgid "Error moving file %s: %s\n"
 msgstr "Fallu al mover el ficheru %s: %s\n"
@@ -2407,31 +2604,34 @@ msgstr "%s: %s: Fallu al abrir l'allugamientu: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: Fallu al llanzar l'aplicación: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "FICHEROS… - abre FICHEROS cola aplicación rexistrada."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
-msgid "Opens the file(s) with the default application registered to handle the type of the file."
-msgstr "Abre'l/los ficheru/os cola aplicación predeterminada rexistrada pa remanar la triba de ficheru."
+#: ../programs/gvfs-open.c:127
+msgid ""
+"Opens the file(s) with the default application registered to handle the type "
+"of the file."
+msgstr ""
+"Abre'l/los ficheru/os cola aplicación predeterminada rexistrada pa remanar "
+"la triba de ficheru."
 
-#: ../programs/gvfs-rename.c:49
+#: ../programs/gvfs-rename.c:50
 msgid "- rename file"
 msgstr "- renomar ficheru"
 
-#: ../programs/gvfs-rename.c:74
+#: ../programs/gvfs-rename.c:76
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Renomáu correchu. URI nuevu: %s\n"
 
-#: ../programs/gvfs-rm.c:35
-#: ../programs/gvfs-trash.c:35
+#: ../programs/gvfs-rm.c:35 ../programs/gvfs-trash.c:35
 msgid "ignore nonexistent files, never prompt"
 msgstr "inorar ficheros esistentes, enxamás entrugar"
 
-#: ../programs/gvfs-rm.c:52
+#: ../programs/gvfs-rm.c:53
 msgid "- delete files"
 msgstr "- desaniciar ficheros"
 
@@ -2478,9 +2678,17 @@ msgstr "Fallu al zarrar: %s\n"
 msgid "Etag not available\n"
 msgstr "Etiqueta-e non disponible\n"
 
+#: ../programs/gvfs-save.c:156
+msgid "DEST - read from standard input and save to DEST"
+msgstr "DESTÍN: lleer d'entrada estándar y guardar en DESTÍN"
+
 #: ../programs/gvfs-set-attribute.c:36
-msgid "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, stringv]"
-msgstr "triba d'atributu [string, bytestring, boolean, uint32, int32, uint64, int64, stringv]"
+msgid ""
+"attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
+"stringv, unset]"
+msgstr ""
+"triba d'atributu [string, bytestring, boolean, uint32, int32, uint64, int64, "
+"stringv, unset]"
 
 #: ../programs/gvfs-set-attribute.c:119
 msgid " <location> <attribute> <values> - set attribute"
@@ -2496,47 +2704,89 @@ msgstr "Nun s'especificó un allugamientu\n"
 msgid "Attribute not specified\n"
 msgstr "Nun s'especificó un atributu\n"
 
-#: ../programs/gvfs-set-attribute.c:189
+#: ../programs/gvfs-set-attribute.c:154
+#, c-format
+msgid "Value not specified\n"
+msgstr "Valor ensin conseñar\n"
+
+#: ../programs/gvfs-set-attribute.c:194
 #, c-format
 msgid "Invalid attribute type %s\n"
 msgstr "Triba d'atributu non válidu %s\n"
 
-#: ../programs/gvfs-set-attribute.c:199
+#: ../programs/gvfs-set-attribute.c:204
 #, c-format
 msgid "Error setting attribute: %s\n"
 msgstr "Fallu al afitar el ficheru: %s\n"
 
-#: ../programs/gvfs-trash.c:51
+#: ../programs/gvfs-trash.c:52
 msgid "- move files to trash"
 msgstr "- mover ficheros a la papelera"
 
-#: ../programs/gvfs-trash.c:67
+#: ../programs/gvfs-trash.c:69
 #, c-format
 msgid "Error trashing file: %s\n"
 msgstr "Fallu al desaniciar el ficheru: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
-msgstr "Siguir enllaces simbólicos, montaxes y atayos como direutorios"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
+msgstr "Siguir venceyos simbólicos, montaxes y atayos como direutorios"
 
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "- llistar los conteníos de los direutorios nuna vista d'árbol"
 
-#~ msgid "Invalid return value from get_info"
-#~ msgstr "get_info devolvió un valor non válidu"
-#~ msgid "Invalid return value from query_info"
-#~ msgstr "query_info devolvió un valor non válidu"
-#~ msgid "Invalid return value from call"
-#~ msgstr "call devolvió un valor non válidu"
-#~ msgid "Invalid return value from get_filesystem_info"
-#~ msgstr "get_filesystem_info devolvió un valor non válidu"
-#~ msgid "Invalid return value from query_filesystem_info"
-#~ msgstr "query_filesystem_info devolvió un valor non válidu"
-#~ msgid "Invalid return value from monitor_dir"
-#~ msgstr "El valor devueltu por monitor_dir nun ye válidu"
-#~ msgid "Invalid return value from monitor_file"
-#~ msgstr "El valor devueltu por monitor_file nun ye válidu"
-#~ msgid "Invalid return value from open_icon_for_read"
-#~ msgstr "open_icon_for_read devolvió un valor non válidu"
+#, c-format
+#~ msgid "Device '%s' is password protected. Enter the password on the device and click 'Try again'."
+#~ msgstr "El preséu «%s» ta protexíu con contraseña. Escribi la contraseña nel preséu y calca «Volver a intentalo»."
+
+#~ msgid "No media in the drive"
+#~ msgstr "Nun hai dengún sofitu na unidá"
+
+#~ msgid "WebDAV on %s"
+#~ msgstr "WebDAV en %s"
+
+#~ msgid "Enter password for ftp as %s on %s"
+#~ msgstr "Introduza la contraseña pal ftp %s en %s"
+
+#~ msgid "Enter password for ftp on %s"
+#~ msgstr "Introduza la contraseña pal ftp en %s"
+
+#~ msgid "ftp on %s"
+#~ msgstr "ftp en %s"
+
+#~ msgid "ftp as %s on %s"
+#~ msgstr "%s nel ftp de %s"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "Fallu al renomar el direutoriu"
+
+#~ msgid "Not supported (src is dir, dst is dir)"
+#~ msgstr "Nun sofitáu (src ye un direutoriu, dst ye un direutoriu)"
+
+#~ msgid "Not supported (src is dir, dst is existing file)"
+#~ msgstr "Nun sofitáu (src ye un direutoriu, dst ye un ficheru esistente)"
+
+#~ msgid "Not supported (src is file, dst is dir)"
+#~ msgstr "Nun sofitáu (src ye un ficheru, dst ye un direutoriu)"
+
+#~ msgid "sftp for %s on %s"
+#~ msgstr "sftp pa %s en %s"
+
+#~ msgid "sftp on %s"
+#~ msgstr "sftp en %s"
+
+#~ msgid "Error sending fd: %s"
+#~ msgstr "Fallu al unviar el descriptor de ficheru: %s"
+
+#~ msgid "Follow symlinks, mounts and shortcuts like dirs"
+#~ msgstr "Siguir enllaces simbólicos, montaxes y atayos como direutorios"
+
+#~ msgid "Service %d on Apple Mobile Device"
+#~ msgstr "Serviciu %d nel preséu móvil d'Apple"
+
+#~ msgid "Unhandled Inst proxy error (%d)"
+#~ msgstr "Fallu non remanable de la instancia del proxy (%d)"
 
+#~ msgid "Unhandled SBServices proxy error (%d)"
+#~ msgstr "Fallu non remanable de SBServices del proxy (%d)"
diff --git a/po/bg.po b/po/bg.po
index 4ce801b2..1094af8e 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -1,14 +1,14 @@
 # Bulgarian translation of gvfs po-file.
-# Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# This file is distributed under the same license as the gvfs package.
-# Alexander Shopov <ash@kambanaria.org>, 2008, 2009, 2010, 2011.
+# Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+#  file is distributed under the same license as the gvfs package.
+# Alexander Shopov <ash@kambanaria.org>, 2008, 2009, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-13 08:19+0300\n"
-"PO-Revision-Date: 2011-09-13 08:19+0300\n"
+"POT-Creation-Date: 2012-01-08 08:32+0200\n"
+"PO-Revision-Date: 2012-01-08 08:32+0200\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -59,13 +59,13 @@ msgstr "Съдържащият монтиран обект не е открит"
 msgid "Invalid filename %s"
 msgstr "Неправилно име на файл: %s"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1199
-#: ../client/gdaemonvfs.c:1334 ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Грешка при задаване на метаданните на файла: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "стойностите трябва да бъдат низ или списък от низове"
 
@@ -79,7 +79,7 @@ msgstr "стойностите трябва да бъдат низ или спи
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
 #: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
 #: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
 #: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
@@ -89,12 +89,12 @@ msgstr "стойностите трябва да бъдат низ или спи
 #: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Действието е отменено"
 
@@ -122,16 +122,16 @@ msgstr "Край на потока"
 msgid "Seek not supported on stream"
 msgstr "Потокът не поддържа търсене"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Грешка при получаване на информация за файловата система: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Не може да се направи връзка със сесийната шина"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Грешка при свързване към демон: %s"
@@ -217,45 +217,45 @@ msgstr "Версия %d на кодирането GVfsIcon не се поддъ�
 msgid "Malformed input data for GVfsIcon"
 msgstr "Неправилни входни данни за GVfsIcon"
 
-#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Грешка при свързване с D-Bus: %s"
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "Услуга за файловата система по %s"
 
-#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../daemon/daemon-main.c:162
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Употреба: %s --spawner ид-dbus път_до_обект"
 
-#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Употреба: %s ключ=стойност ключ=стойност…"
 
-#: ../daemon/daemon-main.c:202
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Не е указан вид при монтирането"
 
-#: ../daemon/daemon-main.c:272
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "точката на монтиране на %s вече работи"
 
-#: ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "грешка при стартирането на монтиращия демон"
 
@@ -328,68 +328,68 @@ msgstr "Въведете паролата за afp към %s"
 msgid "Password dialog cancelled"
 msgstr "Диалоговият прозорец за парола е отменен"
 
-#: ../daemon/gvfsbackendafc.c:212
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Вътрешна грешка в контролния файл на Епъл"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "Файлът не съществува"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "Папката не е празна"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "Устройството не отговори"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "Връзката бе прекъсната"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Получени са неправилни данни за контролния файл на Епъл"
 
-#: ../daemon/gvfsbackendafc.c:236
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Необработена грешка от контролен файл на Епъл (%d)"
 
-#: ../daemon/gvfsbackendafc.c:252
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
 msgstr "Неуспешно изброяване на програмите инсталирани на устройството"
 
-#: ../daemon/gvfsbackendafc.c:268
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
 msgstr "Неуспешен достъп до иконите на програмите на устройството"
 
-#: ../daemon/gvfsbackendafc.c:285
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Грешка при заключване: неправилен аргумент"
 
-#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
 #: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
 #: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
 #: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
 #: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
 #: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
 #: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
-#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "Достъпът е отказан"
 
-#: ../daemon/gvfsbackendafc.c:293
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Необработена грешка при заключване (%d)"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "Грешка от libimobiledevice: неправилен аргумент"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -397,49 +397,49 @@ msgstr ""
 "Грешка от libimobiledevice: не е открито устройство. Проверете дали модулът "
 "usbmuxd е настроен правилно."
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Необработена грешка от устройство на libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
-#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "Отмяна"
-
-#: ../daemon/gvfsbackendafc.c:385
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "Нов опит"
 
-#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "Отмяна"
+
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
 #: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
-#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
-#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Неправилно указан обект за монтиране"
 
-#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
 "Неправилно местоположение за AFC: трябва да е във вида afc://uuid:порт-номер"
 
-#: ../daemon/gvfsbackendafc.c:425
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Преносимо устройство на Епъл"
 
-#: ../daemon/gvfsbackendafc.c:430
+#: ../daemon/gvfsbackendafc.c:427
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Преносимо устройство на Епъл, освободено"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Файлове на мобилно устройство на Епъл"
 
-#: ../daemon/gvfsbackendafc.c:493
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (освободен)"
@@ -447,7 +447,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:500 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "Файлове на %s"
@@ -458,13 +458,14 @@ msgstr "Файлове на %s"
 #: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
-"Device '%s' is password protected. Enter the password 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:918 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
@@ -496,7 +497,7 @@ msgstr "Неправилен вид търсене"
 #: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
 #: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
 #: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
-#: ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "Действието не се поддържа"
 
@@ -782,8 +783,8 @@ msgstr "Неуспешно създаване на временна папка"
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
 #: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
-#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
@@ -803,7 +804,7 @@ msgstr "Създаване на CD/DVD"
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2926
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "Файлът съществува"
 
@@ -826,7 +827,7 @@ msgstr "Файлът съществува"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
 #: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "Модулът не поддържа действието"
@@ -842,16 +843,16 @@ msgid "Target file exists"
 msgstr "Целевият файл съществува"
 
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Не се поддържа"
 
-#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:921
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
 msgid "Unmount Anyway"
 msgstr "Демонтиране въпреки всичко"
 
-#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -859,19 +860,19 @@ msgstr ""
 "Файловата система е заета\n"
 "Една или повече програми не са я освободили."
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "Клиентът за gudev не може да бъде създаден"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Не може да се направи връзка със системната шина"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Контекстът за libhal не може да бъде създаден"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Библиотеката libhal не може да бъде инициализирана"
 
@@ -926,7 +927,7 @@ msgstr "Грешка от „paranoia“ от устройство %s"
 msgid "Error seeking in stream on drive %s"
 msgstr "Грешка при търсене в поток от устройство %s"
 
-#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Няма такъв файл"
@@ -1008,7 +1009,7 @@ msgid "WebDAV on %s%s"
 msgstr "WebDAV на %s%s"
 
 #: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Грешка от HTTP: %s"
@@ -1124,14 +1125,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: Не се поддържа"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, 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:949 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1139,173 +1140,173 @@ msgstr "Камера от %s"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "Аудио плеър от %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Аудио плеър"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Не е указано устройство"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Контекстът за gphoto2 не може да бъде създаден"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Грешка при създаване на камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Грешка при зареждане на информацията за устройството"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Грешка при проверка на информацията за устройството"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Грешка при получаването на информацията за устройството"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Грешка при настройването на порта за комуникация с камерата"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 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:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "монтиране по gphoto2 в %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1766
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Не е указана камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:1828
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Грешка при създаване на файлов обект"
 
-#: ../daemon/gvfsbackendgphoto2.c:1843
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Грешка при получаване на файл"
 
-#: ../daemon/gvfsbackendgphoto2.c:1853
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Грешка при получаване на данни от файл"
 
-#: ../daemon/gvfsbackendgphoto2.c:1911
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Неправилен идентификатор на икона „%s“"
 
-#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Грешка при търсене в поток от камера %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Не е папка"
 
-#: ../daemon/gvfsbackendgphoto2.c:2160
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Неуспешно получаване на съдържанието на папка"
 
-#: ../daemon/gvfsbackendgphoto2.c:2226
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Неуспешно получаване на списъка на файловете"
 
-#: ../daemon/gvfsbackendgphoto2.c:2518
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Грешка при създаване на папка"
 
-#: ../daemon/gvfsbackendgphoto2.c:2727
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "Името вече съществува"
 
-#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "Новото име е прекалено дълго"
 
-#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
 msgstr "Грешка при преименуване на папка"
 
-#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Грешка при преименуване на файл"
 
-#: ../daemon/gvfsbackendgphoto2.c:2825
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Папката „%s“ не е празна"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Грешка при изтриване на папка"
 
-#: ../daemon/gvfsbackendgphoto2.c:2862
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Грешка при изтриване на файл"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "В папката не може да се пише"
 
-#: ../daemon/gvfsbackendgphoto2.c:2962
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Новият файл, към който да се добавя, не може да бъде заделен"
 
-#: ../daemon/gvfsbackendgphoto2.c:2977
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Файлът, към който да се добавя, не може да бъде прочетен"
 
-#: ../daemon/gvfsbackendgphoto2.c:2988
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Данните на файла, към който да се добавя, не могат да бъдат получени"
 
-#: ../daemon/gvfsbackendgphoto2.c:3275
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Грешка при запис във файл"
 
-#: ../daemon/gvfsbackendgphoto2.c:3323
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Не се поддържа (не е същата папка)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3335
+#: ../daemon/gvfsbackendgphoto2.c:3331
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "Не се поддържа (изходният обект е папка, целта — също)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3343
+#: ../daemon/gvfsbackendgphoto2.c:3339
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
 msgstr "Не се поддържа (изходният обект е папка, целта — съществуващ файл)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3355
+#: ../daemon/gvfsbackendgphoto2.c:3351
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Не се поддържа (изходният обект е файл, целта — папка)"
 
-#: ../daemon/gvfsbackendhttp.c:244
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "Клиентска грешка в HTTP: %s"
@@ -1331,13 +1332,13 @@ msgstr "Датчик за местоположения по мрежата"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:681 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: ../daemon/gvfsbackendobexftp.c:890
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "Липсва поддръжка на USB. Свържете се с доставчика на софтуера"
 
@@ -1601,7 +1602,7 @@ msgstr "Обектите в кошчето не могат да бъдат пр�
 msgid "Trash"
 msgstr "Кошче"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Неправилен вид модул"
 
@@ -1615,7 +1616,7 @@ msgid "Unexpected end of stream"
 msgstr "Неочакван край на поток"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Неправилен отговор"
 
@@ -1635,44 +1636,44 @@ msgstr "Не може да се отвори активна връзка по FT
 msgid "Filename contains invalid characters."
 msgstr "Името на файла използва неправилни знаци"
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "Сървърът за FTP е зает. Опитайте по-късно"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "Не се поддържат абонаменти"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "Хостът затвори връзката"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr ""
 "Не може да се отвори връзка за данни. Възможно е да ви пречи защитната стена."
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Връзката за данни бе затворена"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "Неуспешно действие"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Не е останало място на диска"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Неподдържан мрежов протокол"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Неизвестен вид на страницата"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Неправилно име на файл"
 
@@ -1696,22 +1697,22 @@ msgstr "Замяна на стария демон."
 msgid "Don't start fuse."
 msgstr "Fuse да не се стартира"
 
-#: ../daemon/main.c:62
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "Демон на GVFS"
 
-#: ../daemon/main.c:65
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "Основен демон на GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:82 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
 #: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
@@ -1733,7 +1734,7 @@ msgstr "Неправилни аргументи от породения дъще
 msgid "Automount failed: %s"
 msgstr "Неуспешно автоматично монтиране: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:902
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Указаното местоположение не е монтирано"
 
@@ -1741,11 +1742,11 @@ msgstr "Указаното местоположение не е монтиран
 msgid "The specified location is not supported"
 msgstr "Указаното местоположение не се поддържа"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "Местоположението вече е монтирано"
 
-#: ../daemon/mount.c:1052
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "Местоположението не може да се монтира"
 
@@ -1819,17 +1820,17 @@ msgstr ""
 msgid "Start Anyway"
 msgstr "Стартиране въпреки всичко"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Една или повече програми пречат на демонтирането."
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr ""
 "Помощното устройство, което е интерфейс към шифрираното, не може да бъде "
 "получено"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr ""
@@ -2496,12 +2497,17 @@ msgstr "Стандартна програма за „%s“: %s\n"
 msgid "Registered applications:\n"
 msgstr "Регистрирани програми:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:143
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Препоръчани програми:\n"
+
+#: ../programs/gvfs-mime.c:163
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Информацията за програмата за обработка на „%s“ не може да се зареди\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:169
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr ""
@@ -2568,22 +2574,22 @@ msgstr "Грешка при демонтиране: %s\n"
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Съдържащият монтиран обект не е открит: %s\n"
 
-#: ../programs/gvfs-mount.c:683
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Грешка при монтиране на %s: %s\n"
 
-#: ../programs/gvfs-mount.c:697
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Монтиране на %s върху %s\n"
 
-#: ../programs/gvfs-mount.c:748
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Липсва дял съответстващ на файла за устройство %s\n"
 
-#: ../programs/gvfs-mount.c:939
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "— монтиране <местоположение>"
 
diff --git a/po/es.po b/po/es.po
index 4a6c5353..6e7ccd52 100644
--- a/po/es.po
+++ b/po/es.po
@@ -3,15 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.

 # 

 # Jorge González <jorgegonz@svn.gnome.org>, 2008, 2009, 2010, 2011.
, 2011.
-# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
, 2011.
+# Daniel Mustieles <daniel.mustieles@gmail.com>, 2011.
, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs.master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-01 20:15+0000\n"
-"PO-Revision-Date: 2011-12-02 18:15+0100\n"
+"POT-Creation-Date: 2012-01-09 12:10+0000\n"
+"PO-Revision-Date: 2012-01-09 18:04+0100\n"
 "Last-Translator: Daniel Mustieles <daniel.mustieles@gmail.com>\n"
 "Language-Team: Español <gnome-es-list@gnome.org>\n"
 "MIME-Version: 1.0\n"
@@ -329,48 +329,48 @@ msgstr "Introducir la contraseña para AFP en %s"
 msgid "Password dialog cancelled"
 msgstr "Se canceló el diálogo de la contraseña"
 
-#: ../daemon/gvfsbackendafc.c:208
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Error de control de archivos interno de Apple"
 
-#: ../daemon/gvfsbackendafc.c:212 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "El archivo no existe"
 
-#: ../daemon/gvfsbackendafc.c:216
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "La carpeta no está vacía"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "El dispositivo no respondió"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "Se interrumpió la conexión"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Se recibieron datos no válidos del control de archivos de Apple"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Error no manejable de control de archivos de Apple (%d)"
 
-#: ../daemon/gvfsbackendafc.c:248
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
 msgstr "Falló al listar las aplicaciones instaladas en el dispositivo"
 
-#: ../daemon/gvfsbackendafc.c:264
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
 msgstr "Falló al acceder a los iconos de aplicación en el dispositivo"
 
-#: ../daemon/gvfsbackendafc.c:281
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Error de bloqueo: argumento no válido"
 
-#: ../daemon/gvfsbackendafc.c:285 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
 #: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
 #: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
 #: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
@@ -381,16 +381,16 @@ msgstr "Error de bloqueo: argumento no válido"
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../daemon/gvfsbackendafc.c:289
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Error de bloqueo no manejable (%d)"
 
-#: ../daemon/gvfsbackendafc.c:306
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "Error de libimobiledevice: argumento no válido"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -398,21 +398,21 @@ msgstr ""
 "Error de libimobiledevice: no se encontró el dispositivo. Asegúrese de que "
 "usbmuxd está configurado correctamente."
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Error no manejable de libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:381
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "Intentarlo de nuevo"
 
-#: ../daemon/gvfsbackendafc.c:381 ../daemon/gvfsbackend.c:963
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
 #: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../daemon/gvfsbackendafc.c:399 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
 #: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
 #: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
 #: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
@@ -420,27 +420,27 @@ msgstr "Cancelar"
 msgid "Invalid mount spec"
 msgstr "Especificación de montaje no válida"
 
-#: ../daemon/gvfsbackendafc.c:405 ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
 "Ubicación AFC no válida: debe ser de la forma afc://uuid:número-de-puerto"
 
-#: ../daemon/gvfsbackendafc.c:421
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Dispositivo móvil de Apple"
 
-#: ../daemon/gvfsbackendafc.c:426
+#: ../daemon/gvfsbackendafc.c:427
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Dispositivo móvil de Apple, desbloqueado"
 
-#: ../daemon/gvfsbackendafc.c:431
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Documentos en el dispositivo móvil de Apple"
 
-#: ../daemon/gvfsbackendafc.c:489
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s («jailbreak»)"
@@ -448,7 +448,7 @@ msgstr "%s («jailbreak»)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:496 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "Documentación sobre %s"
@@ -456,11 +456,8 @@ msgstr "Documentación sobre %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:575
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
-#| msgid ""
-#| "Device '%s' is password protected. Enter the password on the device and "
-#| "click 'Try again'."
 msgid ""
 "The device '%s' is locked. Enter the passcode on the device and click 'Try "
 "again'."
@@ -468,14 +465,14 @@ msgstr ""
 "El dispositivo «%s» está protegido con contraseña. Introduzca la contraseña "
 "en el dispositivo y pulse «Intentarlo de nuevo»."
 
-#: ../daemon/gvfsbackendafc.c:914 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
 #: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "No se puede abrir la carpeta"
 
-#: ../daemon/gvfsbackendafc.c:924 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
 #: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
 #: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
 #: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
@@ -489,15 +486,15 @@ msgstr "No se puede abrir la carpeta"
 msgid "File doesn't exist"
 msgstr "El archivo no existe"
 
-#: ../daemon/gvfsbackendafc.c:1115 ../daemon/gvfsbackendafc.c:2458
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "Aún no se soportan los respaldos."
 
-#: ../daemon/gvfsbackendafc.c:1287
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "Tipo de búsqueda no soportado"
 
-#: ../daemon/gvfsbackendafc.c:2295 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
 #: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
 #: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
 #: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
@@ -2498,12 +2495,29 @@ msgstr "Aplicación predeterminada para «%s»: %s\n"
 msgid "Registered applications:\n"
 msgstr "Aplicaciones registradas:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+#| msgid "Registered applications:\n"
+msgid "No registered applications\n"
+msgstr "No hay aplicaciones registradas\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Aplicaciones recomendadas:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+#| msgid "Recommended applications:\n"
+msgid "No recommended applications\n"
+msgstr "No hay aplicaciones recomendadas\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Falló al cargar la información para el gestor «%s»\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "falló al establecer «%s» como el gestor predeterminado para «%s»: %s\n"
diff --git a/po/fi.po b/po/fi.po
index a097c6e2..28107bfd 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1,74 +1,75 @@
 # Finnish messages for gvfs
 # Copyright (C) 2008-2009 Free Software Foundation, Inc.
 # Ilkka Tuohela <hile@iki.fi> 2008-2009.
+#
 # Timo Jyrinki <timo.jyrinki@iki.fi>, 2008.
 # Tommi Vainikainen <thv@iki.fi>, 2009-2010.
 # Jussi Aalto, 2010.
-# Jiri Grönroos, 2010-2011.
+# Jiri Grönroos, 2010-2011, 2012.
 # Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>, 2011.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs\n"
-"Report-Msgid-Bugs-To: "
-"http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&component=general\n"
-"POT-Creation-Date: 2011-01-24 02:02+0000\n"
-"PO-Revision-Date: 2011-01-25 14:26+0200\n"
-"Last-Translator: Ville-Pekka Vainio <vpivaini@cs.helsinki.fi>\n"
-"Language-Team: Finnish <gnome-fi-laatu@lists.sourceforge.net>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-01-12 08:33+0100\n"
+"PO-Revision-Date: 2012-01-11 19:09+0200\n"
+"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"Language-Team: Finnish <>\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.4\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2376
+#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
 msgstr "Toiminto ei ole tuettu, tiedostot eri liitospisteissä"
 
 #. Translators: %s is the name of a programming function
-#: ../client/gdaemonfile.c:868 ../client/gdaemonfile.c:902
-#: ../client/gdaemonfile.c:1017 ../client/gdaemonfile.c:1096
-#: ../client/gdaemonfile.c:1159 ../client/gdaemonfile.c:1222
-#: ../client/gdaemonfile.c:1288 ../client/gdaemonfile.c:1350
-#: ../client/gdaemonfile.c:1367 ../client/gdaemonfile.c:1851
-#: ../client/gdaemonfile.c:1880 ../client/gdaemonfile.c:2036
-#: ../client/gdaemonfile.c:2536 ../client/gdaemonfile.c:2585
-#: ../client/gdaemonfile.c:2649 ../client/gdaemonfile.c:2733
-#: ../client/gdaemonfile.c:2808 ../client/gdaemonfile.c:2996
-#: ../client/gdaemonfile.c:3076 ../client/gvfsiconloadable.c:145
+#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
+#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
+#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
+#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
+#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
+#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
+#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
+#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
+#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
+#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
 msgstr "Virheellinen paluuarvo funktiolta %s"
 
-#: ../client/gdaemonfile.c:985 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Virran tiedostokuvaajaa ei saatu"
 
-#: ../client/gdaemonfile.c:1106 ../client/gdaemonfile.c:1169
-#: ../client/gdaemonfile.c:1232 ../client/gdaemonfile.c:1298
-#: ../client/gdaemonfile.c:2615 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Virran tiedostokuvaajaa ei saatu"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1964
+#: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
 msgstr "Yllä olevaa liitospistettä ei voitu selvittää"
 
-#: ../client/gdaemonfile.c:1994
+#: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Virheellinen tiedostonimi %s"
 
-#: ../client/gdaemonfile.c:2232 ../client/gdaemonvfs.c:1200
-#: ../client/gdaemonvfs.c:1335 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Virhe asetettaessa tiedoston metatietoja: %s"
 
-#: ../client/gdaemonfile.c:2233 ../client/gdaemonvfs.c:1389
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "arvojen täytyy olla merkkijonoja tai merkkijonojen luetteloita"
 
@@ -82,22 +83,22 @@ msgstr "arvojen täytyy olla merkkijonoja tai merkkijonojen luetteloita"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1050
-#: ../daemon/gvfsbackendobexftp.c:1087 ../daemon/gvfsbackendobexftp.c:1108
-#: ../daemon/gvfsbackendobexftp.c:1227 ../daemon/gvfsbackendobexftp.c:1364
-#: ../daemon/gvfsbackendobexftp.c:1428 ../daemon/gvfsbackendobexftp.c:1630
-#: ../daemon/gvfsbackendobexftp.c:1737 ../daemon/gvfsbackendobexftp.c:1899
-#: ../daemon/gvfsbackendobexftp.c:1926 ../daemon/gvfsbackendobexftp.c:1985
-#: ../daemon/gvfsbackendobexftp.c:2007 ../daemon/gvfsbackendobexftp.c:2070
-#: ../daemon/gvfsbackendobexftp.c:2089 ../daemon/gvfsbackendsmb.c:1170
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:319
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Toiminto peruttiin"
 
@@ -125,16 +126,16 @@ msgstr "Virta loppui"
 msgid "Seek not supported on stream"
 msgstr "Virta ei tue siirtymistä"
 
-#: ../client/gdaemonvfs.c:832
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Virhe haettaessa tietoja liitospisteestä: %s"
 
-#: ../client/gdaemonvfs.c:1201
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Istuntoväylään ei saatu yhteyttä"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1004
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Virhe yhdistettäessä palvelinprosessiin: %s"
@@ -149,11 +150,11 @@ msgstr "Virhe luotaessa pistoketta: %s"
 msgid "Error connecting to socket: %s"
 msgstr "Virhe yhdistettäessä pistokkeeseen: %s"
 
-#: ../common/gvfsdaemonprotocol.c:522
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
 msgstr "Virheellinen tiedoston tietojen muoto"
 
-#: ../common/gvfsdaemonprotocol.c:540
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
 msgstr "Virheellinen määreiden tietolistan sisältö"
 
@@ -217,123 +218,177 @@ msgstr "GVfsIcon-koodauksen versiota %d ei voi käsitellä"
 msgid "Malformed input data for GVfsIcon"
 msgstr "GVfsIcon-syötedata oli virheellinen"
 
-#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:230
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Virhe D-Bus-yhteydessä: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "%s-tiedostojärjestelmäpalvelu"
 
-#: ../daemon/daemon-main.c:110 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Virhe: %s"
 
-#: ../daemon/daemon-main.c:155
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Käyttö: %s --spawner dbus-tunniste kohde_polku"
 
-#: ../daemon/daemon-main.c:179 ../daemon/daemon-main.c:197
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Käyttö: %s avain=arvo avain=arvo …"
 
-#: ../daemon/daemon-main.c:195
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Liitostyyppiä ei annettu"
 
-#: ../daemon/daemon-main.c:265
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "liitospiste kohteelle %s on jo käynnissä"
 
-#: ../daemon/daemon-main.c:276
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "virhe käynnistettäessä liitospalvelinta"
 
-#: ../daemon/gvfsbackend.c:933 ../monitor/gdu/ggdumount.c:921
-msgid "Unmount Anyway"
-msgstr "Irrota silti"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr ""
 
-#: ../daemon/gvfsbackend.c:934 ../daemon/gvfsbackendafc.c:388
-#: ../monitor/gdu/ggdudrive.c:1022 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "Peru"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "Palvelin ei tue yli 256-merkkisiä salasanoja"
+
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "Virheellinen käyttäjätunnus"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr ""
+
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "Kirjautuminen AFP-palvelimelle %s epäonnistui"
+
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "Palvelin ei tue yli 64-merkkisiä salasanoja"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr ""
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr ""
 
-#: ../daemon/gvfsbackend.c:936 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
 msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
+"Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
-"Taltio on varattu\n"
-"Yksi tai useampi sovellus käyttää taltiota."
+"Kirjautuminen AFP-palvelimelle %s epäonnistui (sopivaa "
+"tunnistautumismekanismia ei löytynyt)"
+
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+msgid "Failed to connect to server (%s)"
+msgstr "Palvelimeen yhdistäminen epäonnistui (%s)"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+msgid "Enter password for afp as %s on %s"
+msgstr "Anna käyttäjän %s afp-palvelimen %s salasana"
 
-#: ../daemon/gvfsbackendafc.c:212
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+msgid "Enter password for afp on %s"
+msgstr "Anna afp-palvelimen %s salasana"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "Salasanakysely keskeytettiin"
+
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Sisäinen Apple File Control -virhe"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:729
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "Tiedostoa ei ole olemassa"
 
-#: ../daemon/gvfsbackendafc.c:219
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "Hakemisto ei ole tyhjä"
 
-#: ../daemon/gvfsbackendafc.c:223
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "Laite ei vastaa"
 
-#: ../daemon/gvfsbackendafc.c:227
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "Yhteys katkaistiin"
 
-#: ../daemon/gvfsbackendafc.c:231
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Saatiin virheellinen Apple File Control -data"
 
-#: ../daemon/gvfsbackendafc.c:235
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Käsittelemätön Apple File Control -virhe (%d)"
 
-#: ../daemon/gvfsbackendafc.c:254
-#, c-format
-msgid "Unhandled Inst proxy error (%d)"
-msgstr ""
+#: ../daemon/gvfsbackendafc.c:249
+msgid "Listing applications installed on device failed"
+msgstr "Laittelle asennettujen sovellusten listaus epäonnistui"
 
-#: ../daemon/gvfsbackendafc.c:273
-#, c-format
-msgid "Unhandled SBServices proxy error (%d)"
+#: ../daemon/gvfsbackendafc.c:265
+msgid "Accessing application icons on device failed"
 msgstr ""
 
-#: ../daemon/gvfsbackendafc.c:290
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Lockdown-virhe: Kelvoton argumentti"
 
-#: ../daemon/gvfsbackendafc.c:294 ../daemon/gvfsbackendsftp.c:310
-#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "Lupa evätty"
 
-#: ../daemon/gvfsbackendafc.c:297
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Käsittelemätön Lockdown-virhe (%d)"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice-virhe: Kelvoton argumentti"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -341,43 +396,48 @@ msgstr ""
 "libimobiledevice-virhe: Laitetta ei löytynyt. Varmista, että usbmuxd on "
 "otettu oikein käyttöön."
 
-#: ../daemon/gvfsbackendafc.c:321
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Käsittelemätön libimobiledevice-virhe (%d)"
 
-#: ../daemon/gvfsbackendafc.c:388
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "Yritä uudelleen"
 
-#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendarchive.c:536
-#: ../daemon/gvfsbackendarchive.c:565 ../daemon/gvfsbackenddav.c:1631
-#: ../daemon/gvfsbackendhttp.c:315 ../daemon/gvfsbackendobexftp.c:863
-#: ../daemon/gvfsbackendobexftp.c:879 ../daemon/gvfsbackendobexftp.c:898
-#: ../daemon/gvfsbackendsmb.c:655
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "Peru"
+
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Virheellinen liitosmäärittely"
 
-#: ../daemon/gvfsbackendafc.c:412 ../daemon/gvfsbackendafc.c:443
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "Viallinen AFC-sijainti: täytyy olla muotoa afc://uuid:porttinumero"
 
-#: ../daemon/gvfsbackendafc.c:428
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Applen mobiililaite"
 
-#: ../daemon/gvfsbackendafc.c:433
+#: ../daemon/gvfsbackendafc.c:427
 #, c-format
-msgid "Service %d on Apple Mobile Device"
-msgstr "Palvelu %d Applen mobiililaitteessa"
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Applen mobiililaite, Jailbreak"
 
-#: ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Asiakirjat Applen mobiililaitteessa"
 
-#: ../daemon/gvfsbackendafc.c:497
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (jailbreak)"
@@ -385,7 +445,7 @@ msgstr "%s (jailbreak)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:504 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "Asiakirjat laitteessa %s"
@@ -393,66 +453,323 @@ msgstr "Asiakirjat laitteessa %s"
 #. translators:
 #. * %s is the device name. 'Try again' is the caption of the button
 #. * shown in the dialog which is defined above.
-#: ../daemon/gvfsbackendafc.c:583
+#: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
-"Device '%s' is password protected. Enter the password on the device and "
-"click 'Try again'."
+"The device '%s' is locked. Enter the passcode on the device and click 'Try "
+"again'."
 msgstr ""
 "Laite '%s' on suojattu salasanalla. Kirjoita laitteen salasana ja napsauta "
 "Yritä uudelleen -painiketta."
 
-#: ../daemon/gvfsbackendafc.c:922 ../daemon/gvfsbackendarchive.c:632
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1886
-#: ../daemon/gvfsbackendobexftp.c:1073 ../daemon/gvfsbackendsmb.c:709
+#: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "Kansiota ei voi avata"
 
-#: ../daemon/gvfsbackendafc.c:932 ../daemon/gvfsbackendarchive.c:624
-#: ../daemon/gvfsbackendarchive.c:668 ../daemon/gvfsbackendarchive.c:720
-#: ../daemon/gvfsbackendarchive.c:749 ../daemon/gvfsbackendcdda.c:986
-#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:392
-#: ../daemon/gvfsbackendftp.c:1060 ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendafc.c:928 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
 #: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
 #: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "Tiedostoa ei ole olemassa"
 
-#: ../daemon/gvfsbackendafc.c:1123 ../daemon/gvfsbackendafc.c:2458
+#: ../daemon/gvfsbackendafc.c:1119 ../daemon/gvfsbackendafc.c:2462
 msgid "Backups are not yet supported."
 msgstr "Varmuuskopioita ei vielä tueta."
 
-#: ../daemon/gvfsbackendafc.c:1295
+#: ../daemon/gvfsbackendafc.c:1291
 msgid "Invalid seek type"
 msgstr "Virheellinen kelaustyyppi"
 
-#: ../daemon/gvfsbackendafc.c:2295 ../daemon/gvfsbackendftp.c:1080
-#: ../daemon/gvfsbackendftp.c:1128 ../daemon/gvfsbackendftp.c:1149
-#: ../daemon/gvfsbackendsftp.c:1832 ../daemon/gvfsbackendsftp.c:4637
-#: ../daemon/gvfsbackendsmb.c:1709 ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "Toiminto ei tue tuettu"
 
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "Palvelimelta vastaanotettiin virhekoodi %d"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "Tiedosto ei ole liitettävissä"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+msgid "AFP shares for %s on %s"
+msgstr "Käyttäjän %s AFP-jaot palvelimella %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+msgid "AFP shares on %s"
+msgstr "Palvelimen %s AFP-jaot"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "Verkkonimeä ei annettu"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Apple Filing Protocol -palvelu"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+msgid "File is a directory"
+msgstr "Tiedosto on kansio"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "Liian monta tiedostoa avoinna"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "Taltiolla ei ole riittävästi tilaa"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+msgid "Target file is open"
+msgstr "Kohdetiedosto on avoinna"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "Kohdetiedosto on jo olemassa"
+
+#: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+#, fuzzy
+msgid "Ancestor directory doesn't exist"
+msgstr "Tiedostoa ei ole olemassa"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "Taltio on kirjoitussuojattu"
+
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "Kansio ei ole tyhjä"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+msgid "Target object doesn't exist"
+msgstr "Kohdeobjektia ei ole olemassa"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:1452
+#, fuzzy
+msgid "Can't move directory into one of it's descendants"
+msgstr "Kansiota ei voi siirtää kansion päälle"
+
+#: ../daemon/gvfsbackendafp.c:1456
+#, fuzzy
+msgid "Can't move sharepoint into a shared directory"
+msgstr "Kansiota ei voi siirtää kansion päälle"
+
+#: ../daemon/gvfsbackendafp.c:1460
+#, fuzzy
+msgid "Can't move a shared directory into the Trash"
+msgstr "Kansiota ei voi siirtää kansion päälle"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:1472
+#, fuzzy
+msgid "Object being moved doesn't exist"
+msgstr "Tiedostoa ei ole olemassa"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "Palvelin ei tue FPCopyFile-toimintoa"
+
+#: ../daemon/gvfsbackendafp.c:1585
+#, fuzzy
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "Virran tiedostokuvaajaa ei saatu"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:1601
+msgid "Source file is a directory"
+msgstr "Lähdetiedosto on kansio"
+
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "Kansiota ei voi kopioida kansion päälle"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "Tiedosto on kansio"
+
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "Kansiota ei voi kopioida rekursiivisesti"
+
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "Kansiota ei voi siirtää kansion päälle"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+msgid "Can't rename volume"
+msgstr "Taltiota ei voi nimetä uudelleen"
+
+#: ../daemon/gvfsbackendafp.c:2218
+#, fuzzy
+msgid "Object with that name already exists"
+msgstr "Nimi on jo olemassa"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:2362
+msgid "Target directory already exists"
+msgstr "Kohdekansio on jo olemassa"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+msgid "Couldn't create temporary file (%s)"
+msgstr "Väliaikaistiedoston luonti epäonnistui (%s)"
+
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "Tiedostoa muokattiin muualta"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "varmuuskopioita ei vielä tueta"
+
+#: ../daemon/gvfsbackendafp.c:3539
+msgid "Directory doesn't exist"
+msgstr "Kansiota ei ole olemassa"
+
+#: ../daemon/gvfsbackendafp.c:3543
+#, fuzzy
+msgid "Target object is not a directory"
+msgstr "Kohde %s ei ole hakemisto\n"
+
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "Virheellinen määretyyppi (odotettiin uint32:ta)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+msgid "Command not supported"
+msgstr "Komento ei ole tuettu"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "Käyttäjän salasana on vanhentunut"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "Käyttäjän salasana on vaihdettava"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FPGetUserInfo epäonnistui (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, fuzzy, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "sftp, käyttäjä: %s, palvelin: %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, fuzzy, c-format
+msgid "AFP volume %s on %s"
+msgstr "Asiakirjat laitteessa %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr ""
+
+#: ../daemon/gvfsbackendafp.c:4303
+msgid "No volume specified"
+msgstr "Taltiota ei ole annettu"
+
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
-#. Translators: This is the name of the root of an sftp share, like "/ on <hostname>"
-#: ../daemon/gvfsbackendarchive.c:323 ../daemon/gvfsbackendsftp.c:2269
+#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
+#: ../daemon/gvfsbackendarchive.c:330 ../daemon/gvfsbackendsftp.c:2269
 #: ../daemon/gvfsftpdircache.c:431
 #, c-format
 msgid "/ on %s"
 msgstr "/ palvelimella %s"
 
-#: ../daemon/gvfsbackendarchive.c:525 ../daemon/gvfsbackendftp.c:660
-#: ../daemon/gvfsbackendsftp.c:1745
-msgid "No hostname specified"
-msgstr "Verkkonimeä ei annettu"
-
-#: ../daemon/gvfsbackendarchive.c:758 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:439
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
 #: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
-#: ../daemon/gvfsbackendsftp.c:3883 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "Tiedosto ei ole kansio"
 
@@ -469,22 +786,17 @@ msgstr "Väliaikaistiedostoa ei voitu luoda"
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:786
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2207
-#: ../daemon/gvfsbackendgphoto2.c:2926 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "Tiedostoa tai kansiota ei löydy"
 
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2223
-#: ../daemon/gvfsbackendsftp.c:1828
-msgid "Directory not empty"
-msgstr "Kansio ei ole tyhjä"
-
 #: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1812
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "Tiedostoa ei voi kopioida kansion päälle"
 
@@ -496,31 +808,31 @@ msgstr "CD-/DVD-luontityökalu"
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:3000
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "Tiedosto on jo olemassa"
 
 #: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:169
-#: ../daemon/gvfsjobcreatemonitor.c:140 ../daemon/gvfsjobcreatemonitor.c:151
-#: ../daemon/gvfsjobcreatemonitor.c:174 ../daemon/gvfsjobcreatemonitor.c:192
-#: ../daemon/gvfsjobdelete.c:122 ../daemon/gvfsjobenumerate.c:256
-#: ../daemon/gvfsjobmakedirectory.c:122 ../daemon/gvfsjobmount.c:109
-#: ../daemon/gvfsjobmountmountable.c:156 ../daemon/gvfsjobmove.c:168
-#: ../daemon/gvfsjobopenforread.c:133 ../daemon/gvfsjobopenforwrite.c:151
-#: ../daemon/gvfsjobopenforwrite.c:165 ../daemon/gvfsjobopenforwrite.c:179
-#: ../daemon/gvfsjobopeniconforread.c:120 ../daemon/gvfsjobpollmountable.c:125
-#: ../daemon/gvfsjobpull.c:175 ../daemon/gvfsjobpush.c:175
-#: ../daemon/gvfsjobqueryattributes.c:135 ../daemon/gvfsjobqueryfsinfo.c:131
-#: ../daemon/gvfsjobqueryinfo.c:149 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141 ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175 ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123 ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123 ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157 ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134 ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166 ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117 ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176 ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136 ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150 ../daemon/gvfsjobqueryinforead.c:119
 #: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
 #: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:150 ../daemon/gvfsjobsetdisplayname.c:127
-#: ../daemon/gvfsjobstartmountable.c:132 ../daemon/gvfsjobstopmountable.c:135
-#: ../daemon/gvfsjobtrash.c:122 ../daemon/gvfsjobunmountmountable.c:139
-#: ../daemon/gvfsjobunmountmountable.c:154 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
-#: ../monitor/gdu/ggduvolume.c:1595
+#: ../daemon/gvfsjobsetattribute.c:151 ../daemon/gvfsjobsetdisplayname.c:128
+#: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
+#: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
+#: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "Taustajärjestelmä ei tue toimintoa"
 
@@ -528,45 +840,47 @@ msgstr "Taustajärjestelmä ei tue toimintoa"
 msgid "No such file or directory in target path"
 msgstr "Kohdepolulla ei ole haluttua kansiota tai hakemistoa"
 
-#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendftp.c:1535
-#: ../daemon/gvfsbackendobexftp.c:1781
-msgid "Can't copy directory over directory"
-msgstr "Kansiota ei voi kopioida kansion päälle"
-
-#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1789
-#: ../daemon/gvfsbackendobexftp.c:1820 ../daemon/gvfsbackendsftp.c:1830
-#: ../daemon/gvfsbackendsftp.c:4445
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "Kohdetiedosto on jo olemassa"
 
-#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendftp.c:1558
-#: ../daemon/gvfsbackendobexftp.c:1796
-msgid "Can't recursively copy directory"
-msgstr "Kansiota ei voi kopioida rekursiivisesti"
-
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2580 ../daemon/gvfsbackendgphoto2.c:2789
-#: ../daemon/gvfsbackendgphoto2.c:2886 ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Ei tuettu"
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "Irrota silti"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"Taltio on varattu\n"
+"Yksi tai useampi sovellus käyttää taltiota."
+
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "Gudev-asiakasta ei voi luoda"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Järjestelmäväylään ei saatu yhteyttä"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Libhal-kontekstia ei voi luoda"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Libhal-kirjastoa ei voi alustaa"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "Asemaa ei annettu"
 
@@ -580,53 +894,54 @@ msgstr "Asemaa %s ei löydy"
 msgid "Drive %s does not contain audio files"
 msgstr "Asema %s ei sisällä äänitiedostoja"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:439
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
 msgstr "cdda-liitos laitteella %s"
 
-#: ../daemon/gvfsbackendcdda.c:440 ../daemon/gvfsbackendcdda.c:960
-#: ../monitor/gdu/ggduvolume.c:337 ../monitor/hal/ghalmount.c:325
+#: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
+#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "Äänilevy"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "Tiedostojärjestelmä on käytössä: %d avoin tiedosto"
 msgstr[1] "Tiedostojärjestelmä on käytössä: %d avointa tiedostoa"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "Tiedostoa %s ei löydy asemasta %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "'Paranoia'-virhe asemasta %s"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "Virhe siirryttäessä virrassa asemassa %s"
 
-#: ../daemon/gvfsbackendcdda.c:979 ../daemon/gvfsbackendgphoto2.c:1894
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Tiedostoa ei löydy"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "Tiedostoa ei ole olemassa tai se ei ole ääniraita"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "Ääni-CD:n tiedostojärjestelmäpalvelu"
 
@@ -652,7 +967,8 @@ msgid "Can't mount file"
 msgstr "Tiedostoa ei voi liittää"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
+#, fuzzy
+msgid "No medium in the drive"
 msgstr "Asemassa ei ole mediaa"
 
 #: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
@@ -681,138 +997,118 @@ msgstr "Tiedostoa ei voi sammuttaa"
 msgid "Can't poll file"
 msgstr "Tiedostoa ei voi pollata"
 
-#: ../daemon/gvfsbackenddav.c:561 ../daemon/gvfsbackenddav.c:1698
-#: ../daemon/gvfsbackendhttp.c:261
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+msgid "WebDAV as %s on %s%s"
+msgstr "WebDAV-jako, käyttäjä: %s, palvelin: %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%s"
+msgstr "WebDAV-jako palvelimella %s%s"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-virhe: %s"
 
-#: ../daemon/gvfsbackenddav.c:578
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Vastausta ei voitu tulkita"
 
-#: ../daemon/gvfsbackenddav.c:587
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Tyhjä vastaus"
 
-#: ../daemon/gvfsbackenddav.c:595
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "Odottamaton vastaus palvelimelta"
 
-#: ../daemon/gvfsbackenddav.c:1214 ../daemon/gvfsbackenddav.c:1838
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Virheellinen vastaus"
 
-#: ../daemon/gvfsbackenddav.c:1357
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "WebDAV-jako"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "Anna kohteen %s salasana"
 
-#: ../daemon/gvfsbackenddav.c:1362
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
 msgstr "Syötä välipalvelimen salasana"
 
-#: ../daemon/gvfsbackenddav.c:1702 ../daemon/gvfsbackenddav.c:1706
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "Jako ei tue WebDAV:ia"
 
-#: ../daemon/gvfsbackenddav.c:1734
-#, c-format
-msgid "WebDAV on %s"
-msgstr "WebDAV-jako palvelimella %s"
-
-#: ../daemon/gvfsbackenddav.c:1794 ../daemon/gvfsbackenddav.c:1867
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "Pyyntöä ei voitu luoda"
 
-#: ../daemon/gvfsbackenddav.c:1930 ../daemon/gvfsbackenddav.c:2183
-#: ../daemon/gvfsbackenddav.c:2294 ../daemon/gvfsbackendftp.c:745
-#: ../daemon/gvfsbackendftp.c:926 ../daemon/gvfsbackendftp.c:1365
-#: ../daemon/gvfsbackendftp.c:1543 ../daemon/gvfsbackendsftp.c:4289
-#: ../daemon/gvfsbackendsmb.c:2054
-msgid "Target file already exists"
-msgstr "Kohdetiedosto on jo olemassa"
-
-#: ../daemon/gvfsbackenddav.c:2003 ../daemon/gvfsbackendsftp.c:3423
-#: ../daemon/gvfsbackendsmb.c:1139
-msgid "The file was externally modified"
-msgstr "Tiedostoa muokattiin muualta"
-
-#: ../daemon/gvfsbackenddav.c:2034 ../daemon/gvfsbackendsmb.c:1175
-#: ../daemon/gvfsbackendsmb.c:2071
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Varmuuskopiotiedoston luonti epäonnistui"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:486 ../daemon/gvfsbackendnetwork.c:371
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
 msgstr "Paikallisverkko"
 
-#: ../daemon/gvfsbackenddnssd.c:730 ../daemon/gvfsbackendnetwork.c:753
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "Tiedostoa tai kansiota ei voi tarkkailla."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:748
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "DNS-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:749 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
 #: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "Verkko"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:481
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "Anna käyttäjän %s ftp-palvelimen %s ftp-salasana"
+msgid "Enter password for FTP as %s on %s"
+msgstr "Anna käyttäjän %s FTP-palvelimen %s salasana"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:484
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "Anna palvelimen %s ftp-salasana"
+msgid "Enter password for FTP on %s"
+msgstr "Anna palvelimen %s FTP-salasana"
 
-#: ../daemon/gvfsbackendftp.c:511 ../daemon/gvfsbackendsftp.c:985
-#: ../daemon/gvfsbackendsmb.c:613 ../daemon/gvfsbackendsmbbrowse.c:995
-msgid "Password dialog cancelled"
-msgstr "Salasanakysely keskeytettiin"
-
-#: ../daemon/gvfsbackendftp.c:623
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ftp palvelimella %s"
+msgid "FTP on %s"
+msgstr "FTP palvelimella %s"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:627
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "ftp, käyttäjä: %s, palvelin: %s"
+msgid "FTP as %s on %s"
+msgstr "FTP, käyttäjä: %s, palvelin: %s"
 
-#: ../daemon/gvfsbackendftp.c:720
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
 msgstr "Oikeudet eivät riitä"
 
-#: ../daemon/gvfsbackendftp.c:766 ../daemon/gvfsbackendsftp.c:2333
-#: ../daemon/gvfsbackendsftp.c:3069 ../daemon/gvfsbackendsftp.c:3410
-#: ../daemon/gvfsbackendsftp.c:4280
-msgid "File is directory"
-msgstr "Tiedosto on kansio"
-
-#: ../daemon/gvfsbackendftp.c:974 ../daemon/gvfsbackendftp.c:1328
-#: ../daemon/gvfsbackendsftp.c:3276
-msgid "backups not supported yet"
-msgstr "varmuuskopioita ei vielä tueta"
-
-#: ../daemon/gvfsbackendftp.c:1121 ../daemon/gvfsbackendsftp.c:4647
-msgid "Invalid attribute type (uint32 expected)"
-msgstr "Virheellinen määretyyppi (odotettiin uint32:ta)"
-
 #: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
@@ -834,188 +1130,188 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: ei tuettu"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "Digitaalikamera (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:949 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
-msgstr "%s-kamera"
+msgstr "Kamera (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "%s-musiikkisoitin"
+msgstr "Musiikkisoitin (%s)"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Musiikkisoitin"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Laitetta ei määritelty"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Gphoto2-kontekstia ei voi luoda"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Virhe luotaessa kameralaitetta"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Virhe ladattaessa tietoja laitteesta"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Virhe etsittäessä tietoja laitteesta"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Virhe pyydettäessä tietoja laitteesta"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Virhe asetettaessa kameran yhteysporttia"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Virhe alustettaessa kameraa"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1683
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2-liitos laitteella %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1765
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Kameraa ei ole annettu"
 
-#: ../daemon/gvfsbackendgphoto2.c:1806 ../daemon/gvfsbackendgphoto2.c:1832
-#, c-format
-msgid "Filesystem is busy"
-msgstr "Tiedostojärjestelmä on varattu"
-
-#: ../daemon/gvfsbackendgphoto2.c:1902
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Virhe luotaessa tiedosto-oliota"
 
-#: ../daemon/gvfsbackendgphoto2.c:1917
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Virhe pyydettäessä tiedostoa"
 
-#: ../daemon/gvfsbackendgphoto2.c:1927
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Virhe pyydettäessä tietoja tiedostosta"
 
-#: ../daemon/gvfsbackendgphoto2.c:1985
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Virheellinen kuvaketunniste ”%s”"
 
-#: ../daemon/gvfsbackendgphoto2.c:2061 ../daemon/gvfsbackendgphoto2.c:3250
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Virhe siirryttäessä virrassa kamerassa %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2201 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Ei ole kansio"
 
-#: ../daemon/gvfsbackendgphoto2.c:2234
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Kansioluetteloa ei saatu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2300
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Tiedostoluetteloa ei saatu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2592
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Virhe luotaessa kansiota"
 
-#: ../daemon/gvfsbackendgphoto2.c:2801
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "Nimi on jo olemassa"
 
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:3441
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "Uusi nimi on liian pitkä"
 
-#: ../daemon/gvfsbackendgphoto2.c:2822 ../daemon/gvfsbackendgphoto2.c:3452
-msgid "Error renaming dir"
-msgstr "Virhe nimettäessä kansiota uudestaan"
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
+msgid "Error renaming directory"
+msgstr "Virhe nimettäessä kansiota uudelleen"
 
-#: ../daemon/gvfsbackendgphoto2.c:2835 ../daemon/gvfsbackendgphoto2.c:3465
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Virhe nimettäessä tiedostoa uudestaan"
 
-#: ../daemon/gvfsbackendgphoto2.c:2899
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Kansio ”%s” ei ole tyhjä"
 
-#: ../daemon/gvfsbackendgphoto2.c:2910
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Virhe poistettaessa kansiota"
 
-#: ../daemon/gvfsbackendgphoto2.c:2936
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Virhe poistettaessa tiedostoa"
 
-#: ../daemon/gvfsbackendgphoto2.c:2989
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Kansioon ei voi kirjoittaa"
 
-#: ../daemon/gvfsbackendgphoto2.c:3036
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Uutta tiedostoa, johon piti lisätä, ei voi varata"
 
-#: ../daemon/gvfsbackendgphoto2.c:3051
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Tiedostoa, johon piti lisätä, ei voi lukea"
 
-#: ../daemon/gvfsbackendgphoto2.c:3062
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Sisältöä tiedostosta, johon piti lisätä, ei saatu"
 
-#: ../daemon/gvfsbackendgphoto2.c:3349
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Virhe kirjoitettaessa tiedostoa"
 
-#: ../daemon/gvfsbackendgphoto2.c:3397
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Ei tuettu (ei ole sama kansio)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3409
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Ei tuettu (lähde on kansio, kohde on kansio)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
+msgstr "Ei tuettu (lähde ja kohde ovat molemmat kansioita)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3417
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "Ei tuettu (lähde on kansio, kohde on olemassa oleva tiedosto)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr "Ei tuettu (lähde on kansio, mutta kohde on olemassa oleva tiedosto)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3429
-msgid "Not supported (src is file, dst is dir)"
-msgstr "Ei tuettu (lähde on tiedosto, kohde on kansio)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
+msgstr "Ei tuettu (lähde on tiedosto, mutta kohde on kansio)"
 
-#: ../daemon/gvfsbackendhttp.c:257
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP-asiakkaan virhe: %s"
@@ -1041,25 +1337,25 @@ msgstr "Verkkosijaintien tarkkailija"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:683 ../daemon/gvfsbackendsmb.c:552
-#: ../daemon/gvfsbackendsmb.c:1424
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s palvelimella %s"
 
-#: ../daemon/gvfsbackendobexftp.c:892
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "USB-tuki puuttuu. Ota yhteyttä ohjelmiston toimittajaan"
 
-#: ../daemon/gvfsbackendobexftp.c:1012
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "Yhteys laitteeseen hukattiin"
 
-#: ../daemon/gvfsbackendobexftp.c:1509
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "Laite vaatii ohjelmistopäivityksen"
 
-#: ../daemon/gvfsbackendobexftp.c:1857 ../daemon/gvfsbackendsmb.c:1945
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "Virhe poistettaessa tiedostoa: %s"
@@ -1159,17 +1455,17 @@ msgstr "Palvelimen tunnistusvahvistusta ei voi lähettää"
 msgid "Protocol error"
 msgstr "Protokollavirhe"
 
-#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp for %s on %s"
-msgstr "sftp, käyttäjä: %s, palvelin: %s"
+msgid "SFTP for %s on %s"
+msgstr "SFTP, käyttäjä: %s, palvelin: %s"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
-msgid "sftp on %s"
-msgstr "sftp palvelimella %s"
+msgid "SFTP on %s"
+msgstr "SFTP palvelimella %s"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
@@ -1182,20 +1478,20 @@ msgstr "Tuettua ssh-komentoa ei löydy"
 #: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
 #: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
 #: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
-#: ../daemon/gvfsbackendsftp.c:3248 ../daemon/gvfsbackendsftp.c:3290
-#: ../daemon/gvfsbackendsftp.c:3475 ../daemon/gvfsbackendsftp.c:3507
-#: ../daemon/gvfsbackendsftp.c:3562 ../daemon/gvfsbackendsftp.c:3619
-#: ../daemon/gvfsbackendsftp.c:3916 ../daemon/gvfsbackendsftp.c:3983
-#: ../daemon/gvfsbackendsftp.c:4118 ../daemon/gvfsbackendsftp.c:4178
-#: ../daemon/gvfsbackendsftp.c:4213 ../daemon/gvfsbackendsftp.c:4241
-#: ../daemon/gvfsbackendsftp.c:4349 ../daemon/gvfsbackendsftp.c:4403
-#: ../daemon/gvfsbackendsftp.c:4442 ../daemon/gvfsbackendsftp.c:4476
-#: ../daemon/gvfsbackendsftp.c:4510 ../daemon/gvfsbackendsftp.c:4525
-#: ../daemon/gvfsbackendsftp.c:4540 ../daemon/gvfsbackendsftp.c:4618
+#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "Saatiin virheellinen vastaus"
 
-#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1431
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
 msgstr " (virheellinen koodaus)"
@@ -1214,92 +1510,88 @@ msgstr "Virheellinen icon_id ”%s” kutsussa OpenIconForRead"
 msgid "Error creating backup file: %s"
 msgstr "Virhe luotaessa varmuuskopiotiedostoa: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3352
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "Virhe luotaessa väliaikaistiedostoa"
 
-#: ../daemon/gvfsbackendsftp.c:4275 ../daemon/gvfsbackendsmb.c:2043
-msgid "Can't move directory over directory"
-msgstr "Kansiota ei voi siirtää kansion päälle"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "%s vaatii salasanan"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "Palvelimen %s Windows-jaot"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "Luetteloa jaoista ei voitu noutaa palvelimelta"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "Ei ole tavallinen tiedosto"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Windows-verkon tiedostojärjestelmäpalvelu"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:236
+#: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
 msgstr "Jako %s palvelimella %s vaatii salasanan"
 
-#: ../daemon/gvfsbackendsmb.c:492 ../daemon/gvfsbackendsmb.c:538
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "Sisäinen virhe (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:618
+#: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
 msgstr "Windows-jakoa ei voitu liittää"
 
-#: ../daemon/gvfsbackendsmb.c:779 ../daemon/gvfsbackendsmb.c:1275
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "Siirtymistyyppi ei ole tuettu"
 
-#: ../daemon/gvfsbackendsmb.c:1367
+#: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "Varmuuskopiotiedoston luonti epäonnistui: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1724
+#: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "Virheellinen määretyyppi (odotettiin uint64:ää)"
 
-#: ../daemon/gvfsbackendsmb.c:2019
+#: ../daemon/gvfsbackendsmb.c:1922
+msgid "Can't rename file, filename already exists"
+msgstr "Tiedostoa ei voi nimetä uudelleen, tiedostonimi on jo olemassa"
+
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Virhe siirrettäessä tiedostoa: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2091
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Virhe poistettaessa kohdetiedostoa: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2115
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Kansiota ei voi siirtää rekursiivisesti"
 
-#: ../daemon/gvfsbackendsmb.c:2159
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
 msgstr "Windows-jakojen tiedostojärjestelmäpalvelu"
 
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:375
-#, c-format
-msgid "Password required for %s"
-msgstr "%s vaatii salasanan"
-
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:902
-#, c-format
-msgid "Windows shares on %s"
-msgstr "Palvelimen %s Windows-jaot"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:1001
-msgid "Failed to retrieve share list from server"
-msgstr "Luetteloa jaoista ei voitu noutaa palvelimelta"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1089 ../daemon/gvfsbackendsmbbrowse.c:1135
-msgid "The file is not a mountable"
-msgstr "Tiedosto ei ole liitettävissä"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1157
-msgid "Not a regular file"
-msgstr "Ei ole tavallinen tiedosto"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1489
-msgid "Windows Network Filesystem Service"
-msgstr "Windows-verkon tiedostojärjestelmäpalvelu"
-
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "Roskakorikansiota ei voi poistaa"
@@ -1314,13 +1606,13 @@ msgstr "Roskakorissa olevia tiedostoja ei voi muokata"
 msgid "Trash"
 msgstr "Roskakori"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Virheellinen taustajärjestelmän tyyppi"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
+msgid "Error sending file descriptor: %s"
 msgstr "Virhe lähettäessä tiedostokuvaajaa: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
@@ -1328,7 +1620,7 @@ msgid "Unexpected end of stream"
 msgstr "Odottamaton virtauksen loppu"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Virheellinen vastaus"
 
@@ -1337,8 +1629,7 @@ msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
 msgstr ""
-"Aktiivisen FTP-yhteyden luonti epäonnistui. Reitittimesi ei kenties tue "
-"sitä."
+"Aktiivisen FTP-yhteyden luonti epäonnistui. Reitittimesi ei kenties tue sitä."
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
@@ -1348,47 +1639,47 @@ msgstr "Aktiivisen FTP-yhteyden luonti epäonnistui."
 msgid "Filename contains invalid characters."
 msgstr "Tiedostonimi sisältää kelvottomia merkkejä."
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP-palvelin on varattu. Yritä myöhemmin uudelleen"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "Tilejä ei ole tuettu"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "Palvelin sulki yhteyden"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr "Datayhteyttä ei voi avata. Palomuuri saattaa estää FTP-datayhteyden."
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Datayhteys on suljettu"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "Toiminto epäonnistui"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Palvelimella ei ole tilaa jäljellä"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Verkkoprotokollalla ei ole tukea"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Sivun tyyppi on tuntematon"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Virheellinen tiedostonimi"
 
-#: ../daemon/gvfsjobmakesymlink.c:126
+#: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
 msgstr "Taustajärjestelmä ei tue symbolisia linkkejä"
 
@@ -1396,6 +1687,10 @@ msgstr "Taustajärjestelmä ei tue symbolisia linkkejä"
 msgid "Invalid dbus message"
 msgstr "Virheellinen dbus-viesti"
 
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "Tiedostojärjestelmä on varattu"
+
 #: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
 msgstr "Korvaa vanha palvelinprosessi."
@@ -1404,33 +1699,35 @@ msgstr "Korvaa vanha palvelinprosessi."
 msgid "Don't start fuse."
 msgstr "Älä käynnistä FUSE:a."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS-palvelinprosessi"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "GVFS-pääpalvelin"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mkdir.c:60
-#: ../programs/gvfs-move.c:111 ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128 ../programs/gvfs-tree.c:251
+#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
+#: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Saat lisätietoja komennolla ”%s --help”."
 
-#: ../daemon/mount.c:459
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
 msgstr "Käynnistetyltä lapsiprosessilta saatiin virheellisiä argumentteja"
 
@@ -1439,19 +1736,19 @@ msgstr "Käynnistetyltä lapsiprosessilta saatiin virheellisiä argumentteja"
 msgid "Automount failed: %s"
 msgstr "Automaattinen liittäminen epäonnistui: %s"
 
-#: ../daemon/mount.c:824 ../daemon/mount.c:898
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Määritelty sijainti ei ole liitetty"
 
-#: ../daemon/mount.c:829
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "Määritelty sijainti ei ole tuettu"
 
-#: ../daemon/mount.c:1036
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "Sijainti on jo liitetty"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "Sijainti ei ole liitettävissä"
 
@@ -1503,12 +1800,12 @@ msgstr "Nimetön asema (%s)"
 msgid "Unnamed Drive"
 msgstr "Nimetön asema"
 
-#: ../monitor/gdu/ggdudrive.c:561 ../monitor/hal/ghaldrive.c:662
-#, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
+#: ../monitor/gdu/ggdudrive.c:561
+#, fuzzy, c-format
+msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr "Asemaa ei voitu avata: yksi tai useampi taltio medialla on käytössä."
 
-#: ../monitor/gdu/ggdudrive.c:1015
+#: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
 "Starting a drive in degraded mode means that the drive is no longer tolerant "
@@ -1519,28 +1816,28 @@ msgstr ""
 "siedä virheitä. Asemalla olevat tiedot saattavat hävitä pysyvästi mikäli "
 "komponentti hajoaa."
 
-#: ../monitor/gdu/ggdudrive.c:1021
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "Käynnistä silti"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Yksi tai useampi ohjelma estää irrotusoperaation."
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "Ei saatu LUKS-selvätekstiorjaa"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Ei saatu LUKS-selvätekstiorjaa polusta ”%s”"
 
-#: ../monitor/gdu/ggduvolume.c:325
+#: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
 msgstr "Levyke"
 
-#: ../monitor/gdu/ggduvolume.c:1075
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1549,7 +1846,7 @@ msgstr ""
 "Syötä salasana taltion avaamiseksi\n"
 "Laite ”%s” sisältää salakirjoitettua tietoa osiolla %d."
 
-#: ../monitor/gdu/ggduvolume.c:1082
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1558,7 +1855,7 @@ msgstr ""
 "Syötä salasana taltion avaamiseksi\n"
 "Laite ”%s” sisältää salakirjoitettua tietoa."
 
-#: ../monitor/gdu/ggduvolume.c:1089
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1843,6 +2140,11 @@ msgstr "Muistitikku"
 msgid "Mass Storage Drive"
 msgstr "Massatallennusasema"
 
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+msgid "Failed to eject media; one or more volumes on the media are busy."
+msgstr "Asemaa ei voitu avata: yksi tai useampi taltio medialla on käytössä."
+
 #: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
@@ -1863,11 +2165,10 @@ msgid "Mixed Audio/Data Disc"
 msgstr "Yhdistetty ääni- ja datalevy"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
-msgstr "Media %s"
+msgid "%s Medium"
+msgstr "%s media"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -1875,6 +2176,12 @@ msgstr "Media %s"
 msgid "%s Encrypted Data"
 msgstr "Salattua tietoa %s"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "Media %s"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
 msgstr "sijainnit"
@@ -1922,29 +2229,30 @@ msgid ""
 msgstr ""
 "Yhdistä tietoja eri sijainneista ja tulosta ne oletussyötteeseen. Toimii "
 "aivan kuten perinteinen ohjelma cat, mutta käyttää gvfs-sijainteja "
-"paikallisten tiedostojen sijasta. Voit esimerkiksi käyttää sijaintia "
-"smb://server/resource/file.txt liitettävänä tiedostona."
+"paikallisten tiedostojen sijasta. Voit esimerkiksi käyttää sijaintia smb://"
+"server/resource/file.txt liitettävänä tiedostona."
 
 #: ../programs/gvfs-cat.c:148
 msgid ""
 "Note: just pipe through cat if you need its formatting option like -n, -T or "
 "other."
 msgstr ""
-"Huomautus: putkita cat:n kautta, jos tarvitset sen muotoiluvalintoja kuten "
-"-n tai -T."
+"Huomautus: putkita cat:n kautta, jos tarvitset sen muotoiluvalintoja kuten -"
+"n tai -T."
 
 #: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
 #: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mkdir.c:58 ../programs/gvfs-move.c:109
-#: ../programs/gvfs-open.c:138 ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126 ../programs/gvfs-tree.c:249
+#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
+#: ../programs/gvfs-tree.c:249
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "Virhe jäsennettäessä komentorivivalitsimia: %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: sijainti puuttuu"
@@ -2138,6 +2446,72 @@ msgstr "Virhe: %s\n"
 msgid "- list files at <location>"
 msgstr "– luettele tiedostot sijainnissa <sijainti>"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "Ei oletussovellusta tiedostoille '%s'\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "Oletussovellus tiedostoille '%s': %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "Ei rekisteröityjä sovelluksia\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Suositellut sovellukset:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "Ei suositeltuja sovelluksia\n"
+
+#: ../programs/gvfs-mime.c:167
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr ""
+
+#: ../programs/gvfs-mime.c:173
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr ""
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
 msgstr "luo ylähakemistot"
@@ -2171,49 +2545,50 @@ msgstr "Irrota"
 msgid "Unmount all mounts with the given scheme"
 msgstr "Irrota kaikki liitokset annetulla välineellä"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
 msgstr "Luetteloi"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
 msgstr "Näytä lisätiedot luetteloinnissa ja valvonnassa"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
 msgstr "Valvo tapahtumia"
 
-#: ../programs/gvfs-mount.c:163 ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "Virhe liitettäessä sijaintia: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "Virhe irrotettaessa liitosta: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Virhe etsittäessä sisältävää liitosta: %s\n"
 
-#: ../programs/gvfs-mount.c:682
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Virhe liitettäessä %s: %s\n"
 
-#: ../programs/gvfs-mount.c:696
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Liitetty %s sijaintiin %s\n"
 
-#: ../programs/gvfs-mount.c:747
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Ei taltiota laitetiedostolle %s\n"
 
-#: ../programs/gvfs-mount.c:938
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "– liitä <sijainti>"
 
@@ -2244,13 +2619,13 @@ msgstr "%s: %s: virhe avattaessa sijaintia: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: virhe käynnistettäessä ohjelmaa: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "TIEDOSTOT… – avaa TIEDOSTOT rekisteröidyllä ohjelmalla."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
+#: ../programs/gvfs-open.c:127
 msgid ""
 "Opens the file(s) with the default application registered to handle the type "
 "of the file."
@@ -2369,7 +2744,7 @@ msgid "Error trashing file: %s\n"
 msgstr "Virhe siirrettäessä roskakoriin tiedostoa: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
 msgstr ""
 "Seuraa symbolisia linkkejä, liitoksia ja pikakuvakkeita kuten hakemistoja"
 
@@ -2377,8 +2752,20 @@ msgstr ""
 msgid "- list contents of directories in a tree-like format"
 msgstr "- luettele hakemistojen sisällöt puumaisessa muodossa"
 
-msgid "broken transmission"
-msgstr "siirto keskeytyi"
+#~ msgid "Service %d on Apple Mobile Device"
+#~ msgstr "Palvelu %d Applen mobiililaitteessa"
+
+#~ msgid "ftp on %s"
+#~ msgstr "ftp palvelimella %s"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "Virhe nimettäessä kansiota uudestaan"
+
+#~ msgid "sftp on %s"
+#~ msgstr "sftp palvelimella %s"
+
+#~ msgid "broken transmission"
+#~ msgstr "siirto keskeytyi"
 
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
diff --git a/po/gl.po b/po/gl.po
index 65c099b9..16e1af9c 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -7,20 +7,20 @@
 # Antón Méixome <meixome@mancomun.org>, 2009.
 # Antón Méixome <meixome@certima.net>, 2010.
 # Fran Diéguez <frandieguez@gnome.org>, 2009, 2010, 2011.
-# Fran Dieguez <frandieguez@gnome.org>, 2009, 2011.
+# Fran Dieguez <frandieguez@gnome.org>, 2009, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs-master-po-gl-70600.merged\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-04 23:31+0200\n"
-"PO-Revision-Date: 2011-09-04 23:31+0200\n"
+"POT-Creation-Date: 2012-01-15 02:29+0100\n"
+"PO-Revision-Date: 2012-01-15 02:30+0100\n"
 "Last-Translator: Fran Dieguez <frandieguez@gnome.org>\n"
-"Language-Team: Galego <gnome-l10n-gl@gnome.org>\n"
+"Language-Team: Galician <gnome-l10n-gl@gnome.org>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bits\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n!=1);\n"
 "X-Generator: KBabel 1.11.4\n"
 
@@ -66,13 +66,13 @@ msgstr "Non foi posíbel atopar un punto de montaxe incluído"
 msgid "Invalid filename %s"
 msgstr "O nome de ficheiro %s non é válido"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1199
-#: ../client/gdaemonvfs.c:1334 ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Produciuse un erro ao estabelecer os metadatos do ficheiro: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "os valores deben ser unha cadea ou unha lista de cadeas"
 
@@ -86,7 +86,7 @@ msgstr "os valores deben ser unha cadea ou unha lista de cadeas"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
 #: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
 #: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
 #: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
@@ -96,12 +96,12 @@ msgstr "os valores deben ser unha cadea ou unha lista de cadeas"
 #: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Cancelouse a operación"
 
@@ -129,16 +129,16 @@ msgstr "Fin do fluxo"
 msgid "Seek not supported on stream"
 msgstr "O fluxo non admite a busca"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Produciuse un erro ao obter información de montaxe: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Non é posíbel conectar co bus da sesión"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Produciuse un erro ao conectarse co daemon: %s"
@@ -222,45 +222,45 @@ msgstr "Non é posíbel manipular a versión %d da codificación GVfsIcon"
 msgid "Malformed input data for GVfsIcon"
 msgstr "Os datos de entrada para GVfsIcon están malformados"
 
-#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Produciuse un erro ao conectar co D-Bus: %s"
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "Servizo de sistema de ficheiros %s"
 
-#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Erro: %s"
 
-#: ../daemon/daemon-main.c:162
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Uso: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Uso: %s key=value key=value …"
 
-#: ../daemon/daemon-main.c:202
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Non se especificou ningún tipo de montaxe"
 
-#: ../daemon/daemon-main.c:272
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "o punto de montaxe para %s xa se está executando"
 
-#: ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "produciuse un erro ao iniciar o daemon de montaxe"
 
@@ -333,69 +333,69 @@ msgstr "Escriba o contrasinal para o AFP en %s"
 msgid "Password dialog cancelled"
 msgstr "Cancelouse a caixa de diálogo do contrasinal"
 
-#: ../daemon/gvfsbackendafc.c:212
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Erro interno de control de ficheiro de Apple"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "O ficheiro non existe"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "O cartafol non está baleiro"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "O dispositivo non responde"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "A conexión foi interrompida"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Recibíronse datos de control de ficheiro de Apple incorrectos"
 
-#: ../daemon/gvfsbackendafc.c:236
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Produciuse un erro de control de ficheiro de Apple non xestionado (%d)"
 
-#: ../daemon/gvfsbackendafc.c:252
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
 msgstr ""
 "Produciuse un fallo ao mostrar os aplicativos instalados no dispositivo"
 
-#: ../daemon/gvfsbackendafc.c:268
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
 msgstr "Produciuse un fallo ao acceder ás iconas de aplicativo no dispositivo"
 
-#: ../daemon/gvfsbackendafc.c:285
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Erro de bloqueo: argumento incorrecto"
 
-#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
 #: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
 #: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
 #: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
 #: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
 #: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
 #: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
-#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
-#: ../daemon/gvfsbackendafc.c:293
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Erro de bloqueo non manexábel (%d)"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "Produciuse un erro no libimobiledevice: argumento incorrecto"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -403,49 +403,49 @@ msgstr ""
 "Produciuse un erro no libimobiledevice: Non foi posíbel atopar o "
 "dispositivo. Asegúrese que usbmuxd está configurado correctamente."
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Produciuse un erro non xestionábel en libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
-#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "Cancelar"
-
-#: ../daemon/gvfsbackendafc.c:385
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "Tentar de novo"
 
-#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
 #: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
-#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
-#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "A especificación de montaxe non é válida"
 
-#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
 "Localización AFC incorrecto: debe ser da forma afc://uuid:número-de-porto"
 
-#: ../daemon/gvfsbackendafc.c:425
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Dispositivo móbil de Apple"
 
-#: ../daemon/gvfsbackendafc.c:430
+#: ../daemon/gvfsbackendafc.c:427
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Dispositivo móbil de Apple, desbloqueado"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Documentos no dispositivo móbil de Apple"
 
-#: ../daemon/gvfsbackendafc.c:493
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s («jailbreak»)"
@@ -453,7 +453,7 @@ msgstr "%s («jailbreak»)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "Documentación sobre %s"
@@ -464,14 +464,14 @@ msgstr "Documentación sobre %s"
 #: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
-"Device '%s' is password protected. Enter the password on the device and "
-"click 'Try again'."
+"The device '%s' is locked. Enter the passcode on the device and click 'Try "
+"again'."
 msgstr ""
-"O dispositivo «%s» está protexido por un contrasinal. Introduza o "
-"contrasinal no dispositivo e prema «Tentar de novo»."
+"O dispositivo «%s» está bloqueao. Introduza o código de paso no dispositivo "
+"e prema «Tentar de novo»."
 
 #: ../daemon/gvfsbackendafc.c:918 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
@@ -502,8 +502,8 @@ msgstr "Tipo de busca incorrecta"
 #: ../daemon/gvfsbackendafc.c:2299 ../daemon/gvfsbackendafp.c:3809
 #: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
 #: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
-#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1718
-#: ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "A operación non é compatíbel"
 
@@ -571,7 +571,7 @@ msgstr "O ficheiro de destino está aberto"
 #: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
 #: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
 #: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
-#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2081
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
 msgid "Target file already exists"
 msgstr "O ficheiro de destino xa existe"
 
@@ -657,7 +657,7 @@ msgid "Can't recursively copy directory"
 msgstr "Non é posíbel copiar un cartafol recursivamente"
 
 #: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
-#: ../daemon/gvfsbackendsmb.c:2070
+#: ../daemon/gvfsbackendsmb.c:2071
 msgid "Can't move directory over directory"
 msgstr "Non é posíbel mover un cartafol sobre outro cartafol"
 
@@ -787,8 +787,8 @@ msgstr "Non é posíbel crear un cartafol temporal"
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
 #: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
-#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
@@ -808,7 +808,7 @@ msgstr "Creador de CD ou DVD"
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2926
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "O ficheiro xa existe"
 
@@ -831,7 +831,7 @@ msgstr "O ficheiro xa existe"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
 #: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "O backend non admite a operación"
@@ -847,16 +847,16 @@ msgid "Target file exists"
 msgstr "O ficheiro de destino existe"
 
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Non compatíbel"
 
-#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:921
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
 msgid "Unmount Anyway"
 msgstr "Desmontar de todas formas"
 
-#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -864,19 +864,19 @@ msgstr ""
 "O volume está ocupado\n"
 "Un ou máis aplicativos manteñen o volume ocupado."
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "Non é posíbel crear o cliente gudev"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Non é posíbel conectar co bus do sistema"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Non é posíbel crear o contexto libhal"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Non é posíbel inicializar libhal"
 
@@ -931,7 +931,7 @@ msgstr "Produciuse un erro desde 'paranoia' no dispositivo %s"
 msgid "Error seeking in stream on drive %s"
 msgstr "Produciuse un erro ao buscar no fluxo do dispositivo %s"
 
-#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Non existe ese ficheiro"
@@ -1013,7 +1013,7 @@ msgid "WebDAV on %s%s"
 msgstr "WebDAV en %s%s"
 
 #: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "Erro HTTP: %s"
@@ -1058,7 +1058,7 @@ msgid "Could not create request"
 msgstr "Non foi posíbel crear a petición"
 
 #: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
-#: ../daemon/gvfsbackendsmb.c:2098
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Produciuse un fallou a creación do ficheiro de copia de seguranza"
 
@@ -1129,14 +1129,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: Non se admite"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "Cámara dixital (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:949 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1144,163 +1144,163 @@ msgstr "Cámara %s"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "Reprodutor de son %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Reprodutor de son"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Non se especificou ningún dispositvo"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Non é posíbel crear o contexto gphoto2"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Produciuse un erro ao crear a cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Produciuse un erro ao cargar a información do dispositivo"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Produciuse un erro ao buscar a información do dispositivo"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Produciuse un erro ao obter a información do dispositivo"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Produciuse un erro ao configurar o porto de comunicacións da cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Produciuse un erro ao inicializar a cámara"
 
 #. 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:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 montado en %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1766
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Non se especificou ningunha cámara"
 
-#: ../daemon/gvfsbackendgphoto2.c:1828
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Produciuse un erro ao crear o obxecto de ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:1843
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Produciuse un erro ao obter o ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:1853
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Produciuse un erro ao obter os datos do ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:1911
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Identificador de iconas «%s» malformado"
 
-#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Produciuse un erro ao buscar no fluxo na cámara «%s»"
 
-#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Non é un cartafol"
 
-#: ../daemon/gvfsbackendgphoto2.c:2160
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Produciuse un fallo ao obter a lista de cartafoles"
 
-#: ../daemon/gvfsbackendgphoto2.c:2226
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Produciuse un fallo ao obter a lista de ficheiros"
 
-#: ../daemon/gvfsbackendgphoto2.c:2518
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Produciuse un erro ao crear o cartafol"
 
-#: ../daemon/gvfsbackendgphoto2.c:2727
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "O nome xa existe"
 
-#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "O nome novo é demasiado longo"
 
-#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
 msgstr "Produciuse un erro ao renomear o cartafol"
 
-#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Produciuse un erro ao renomear o ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:2825
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "O cartafol non «%s» está baleiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Produciuse un erro ao eliminar o cartafol"
 
-#: ../daemon/gvfsbackendgphoto2.c:2862
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Produciuse un erro ao eliminar o ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Non é posíbel escribir no cartafol"
 
-#: ../daemon/gvfsbackendgphoto2.c:2962
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Non é posíbel asignar un ficheiro novo para anexalo a"
 
-#: ../daemon/gvfsbackendgphoto2.c:2977
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Non é posíbel ler o ficheiro para anexalo a"
 
-#: ../daemon/gvfsbackendgphoto2.c:2988
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Non é posíbel obter datos do ficheiro para anexalo a"
 
-#: ../daemon/gvfsbackendgphoto2.c:3275
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Produciuse un erro ao escribir no ficheiro"
 
-#: ../daemon/gvfsbackendgphoto2.c:3323
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Non é compatíbel (non está no mesmo cartafol)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3335
+#: ../daemon/gvfsbackendgphoto2.c:3331
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr ""
 "Non é compatíbel (o orixe é un cartafol, o destino tamén é un cartafol)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3343
+#: ../daemon/gvfsbackendgphoto2.c:3339
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
@@ -1308,12 +1308,12 @@ msgstr ""
 "Non é compatíbel (o orixe é un cartafol, pero o destino é un ficheiro "
 "existente)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3355
+#: ../daemon/gvfsbackendgphoto2.c:3351
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Non é compatíbel (a orixe é un ficheiro, pero o destino é un cartafol)"
 
-#: ../daemon/gvfsbackendhttp.c:244
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "Erro de cliente HTTP: %s"
@@ -1339,13 +1339,13 @@ msgstr "Monitor de localización de rede"
 #. 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:681 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s en %s"
 
-#: ../daemon/gvfsbackendobexftp.c:890
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "Falta a compatibilidade de USB. Contacte co seu provedor de software"
 
@@ -1357,7 +1357,7 @@ msgstr "Perdeuse a conexión co dispositivo"
 msgid "Device requires a software update"
 msgstr "O dispositivo require unha actualización do software"
 
-#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1972
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
 msgid "Error deleting file: %s"
 msgstr "Produciuse un erro ao eliminar o ficheiro: %s"
@@ -1570,29 +1570,29 @@ msgstr "O tipo de busca non é compatíbel"
 msgid "Backup file creation failed: %s"
 msgstr "Produciuse un erro na creación do ficheiro de copia de seguranza: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1733
+#: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "O tipo de atributo non é válido (agardábase un uint64)"
 
-#: ../daemon/gvfsbackendsmb.c:1921
+#: ../daemon/gvfsbackendsmb.c:1922
 msgid "Can't rename file, filename already exists"
 msgstr "Non é posíbel renomear o ficheiro; o nome de ficheiro xa existe"
 
-#: ../daemon/gvfsbackendsmb.c:2046
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Produciuse un erro ao mover o ficheiro: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2118
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Produciuse un erro ao mover o ficheiro de destino: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2142
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Non é posíbel mover o cartafol recursivamente"
 
-#: ../daemon/gvfsbackendsmb.c:2186
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
 msgstr "Servizo de sistema de ficheiros compartidos con Windows"
 
@@ -1610,7 +1610,7 @@ msgstr "Pode que non se modificasen os elementos do lixo"
 msgid "Trash"
 msgstr "Lixo"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "O tipo de backend non é válido"
 
@@ -1624,7 +1624,7 @@ msgid "Unexpected end of stream"
 msgstr "Fin inesperado do fluxo"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Resposta incorrecta"
 
@@ -1644,45 +1644,45 @@ msgstr "Produciuse un fallo coa creación dunha conexión FTP activa."
 msgid "Filename contains invalid characters."
 msgstr "O nome do ficheiro contén caracteres incorrectos."
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "O servidor de FTP está ocupado. Ténteo de novo máis tarde"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "As contas non son compatíbeis"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "Conexión ao host pechada"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr ""
 "Non é posíbel abrir a conexión de datos. Podería ser que a súa devasa o "
 "impida?"
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Conexión de datos pechada"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "A operación fallou"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Non queda espazo no servidor "
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Este protocolo de rede  non é compatíbel"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Tipo de páxina descoñecido"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "O nome de ficheiro non é válido"
 
@@ -1706,22 +1706,22 @@ msgstr "Substituír o daemon antigo."
 msgid "Don't start fuse."
 msgstr "Non iniciar fuse."
 
-#: ../daemon/main.c:62
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "Daemon GVFS"
 
-#: ../daemon/main.c:65
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "O daemon principal para GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:82 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
 #: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
@@ -1743,7 +1743,7 @@ msgstr "Os argumentos do fillo iniciado non son correctos"
 msgid "Automount failed: %s"
 msgstr "Fallou a montaxe automática: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:902
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "A localización especificada non está montada"
 
@@ -1751,11 +1751,11 @@ msgstr "A localización especificada non está montada"
 msgid "The specified location is not supported"
 msgstr "A localización especificada non é compatíbel"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "A localización xa está montada"
 
-#: ../daemon/mount.c:1052
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "A localización non é montábel"
 
@@ -1829,15 +1829,15 @@ msgstr ""
 msgid "Start Anyway"
 msgstr "Iniciar de todas formas"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Un ou máis programas están impedindo a operación de desmontado."
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "Non foi posíbel obter o escravo LUKS en texto claro"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Non foi posíbel obter o escravo LUKS en texto claro na ruta «%s»"
@@ -2498,12 +2498,27 @@ msgstr "Aplicativo predeterminado para «%s»: %s\n"
 msgid "Registered applications:\n"
 msgstr "Aplicativos rexistrados:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "Aplicativos non rexistrados:\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Aplicativos recomendados:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "Aplicativos non recomendados:\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Produciuse un fallo ao cargar a información para o manexador «%s»\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr ""
@@ -2571,22 +2586,22 @@ msgstr "Produciuse un erro ao desmontar o punto de montaxe: %s\n"
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Produciuse un erro ao atopar o punto de montaxe incluído: %s\n"
 
-#: ../programs/gvfs-mount.c:683
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Produciuse un erro ao montar %s: %s\n"
 
-#: ../programs/gvfs-mount.c:697
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Montouse %s en %s\n"
 
-#: ../programs/gvfs-mount.c:748
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Non hai volume para o ficheiro de dispositivo %s\n"
 
-#: ../programs/gvfs-mount.c:939
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- monta <localización>"
 
diff --git a/po/he.po b/po/he.po
index 9ab3569f..0b9fdaa2 100644
--- a/po/he.po
+++ b/po/he.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-10 10:39+0200\n"
-"PO-Revision-Date: 2011-12-10 10:39+0200\n"
+"POT-Creation-Date: 2012-01-13 09:27+0200\n"
+"PO-Revision-Date: 2012-01-13 09:28+0200\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Gezer (Hebrew)\n"
 "Language: he\n"
@@ -2758,12 +2758,27 @@ msgstr "Default application for '%s': %s\n"
 msgid "Registered applications:\n"
 msgstr "Registered applications:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "No registered applications\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Recommended applications:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "No recommended applications\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Failed to load info for handler '%s'\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "Failed to set '%s' as the default handler for '%s': %s\n"
diff --git a/po/ja.po b/po/ja.po
index ad58286a..f184fefc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1,19 +1,20 @@
 # gvfs ja.po.
-# Copyright (C) 2008-2011 Free Software Foundation, Inc.
+# Copyright (C) 2008-2012 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gvfs package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2008, 2009.
 # Shushi Kurose <md81bird@hitaki.net>, 2010.
-# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010-2011.
+# Takayuki KUSANO <AE5T-KSN@asahi-net.or.jp>, 2010-2012.
+# Hideki Yamane <henrich@debian.org>, 2011.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-09-10 21:31+0000\n"
-"PO-Revision-Date: 2011-09-11 07:40+0900\n"
+"POT-Creation-Date: 2012-01-02 11:51+0000\n"
+"PO-Revision-Date: 2012-01-04 00:45+0900\n"
 "Last-Translator: Jiro Matsuzawa <jmatsuzawa@src.gnome.org>\n"
-"Language-Team: Japanese <takeshi.aihana@gmail.com>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -38,36 +39,36 @@ msgstr "サポートされていない操作です (ファイルが別々のマ�
 #: ../client/gvfsiconloadable.c:374
 #, c-format
 msgid "Invalid return value from %s"
-msgstr "%s からの戻り値が間違っています"
+msgstr "%s からの無効な戻り値"
 
 #: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
-msgstr "ストリーム・ファイルのディスクリプターを取得できませんでした"
+msgstr "ストリームファイルのディスクリプターを取得できませんでした"
 
 #: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
 #: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
 #: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
-msgstr "ストリーム・ファイルのディスクリプターを取得しませんでした"
+msgstr "ストリームファイルのディスクリプターを取得しませんでした"
 
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
 #: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
-msgstr "閉じているマウントが見つかりませんでした"
+msgstr "関連するマウントが見つかりませんでした"
 
 #: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
-msgstr "ファイル名が間違っています: %s"
+msgstr "無効なファイル名: %s"
 
-#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1199
-#: ../client/gdaemonvfs.c:1334 ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "ファイルのメタデータを設定中にエラー: %s"
 
-#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "値は文字列または文字列リストである必要があります"
 
@@ -81,7 +82,7 @@ msgstr "値は文字列または文字列リストである必要があります
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1059
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
 #: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
 #: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
 #: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
@@ -91,14 +92,14 @@ msgstr "値は文字列または文字列リストである必要があります
 #: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
 #: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514 ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750 ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936 ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471 ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807 ../monitor/proxy/gproxyvolume.c:884
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
-msgstr "操作がキャンセルされた"
+msgstr "操作がキャンセルされました"
 
 #: ../client/gdaemonfileinputstream.c:527
 #: ../client/gdaemonfileinputstream.c:535
@@ -124,16 +125,16 @@ msgstr "ストリームの末尾"
 msgid "Seek not supported on stream"
 msgstr "ストリーム上のシークはサポートしていません"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "マウント情報を取得する際にエラー: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "セッションバスに接続できません"
 
-#: ../client/gvfsdaemondbus.c:572 ../client/gvfsdaemondbus.c:1013
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "デーモンに接続する際にエラー: %s"
@@ -150,11 +151,11 @@ msgstr "ソケットに接続する際にエラー: %s"
 
 #: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
-msgstr "ファイル情報の書式が間違っています"
+msgstr "無効なファイル情報形式"
 
 #: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
-msgstr "属性情報のリストにあるデータが間違っています"
+msgstr "無効な属性情報一覧"
 
 #: ../common/gvfsdnssdresolver.c:209
 #, c-format
@@ -164,7 +165,7 @@ msgstr "Avahi のデーモンを初期化する際にエラー: %s"
 #: ../common/gvfsdnssdresolver.c:255
 #, c-format
 msgid "Error creating Avahi resolver: %s"
-msgstr "Avahi のレゾルバを生成する際にエラー: %s"
+msgstr "Avahi のリゾルバーを生成する際にエラー: %s"
 
 #. Translators:
 #. * - the first %s refers to the service type
@@ -218,178 +219,176 @@ msgstr "バージョン %d の GVfsIcon 型エンコーディングはサポー�
 msgid "Malformed input data for GVfsIcon"
 msgstr "GVfsIcon 型の入力データの形式が間違っています"
 
-#: ../daemon/daemon-main.c:82 ../daemon/daemon-main.c:237
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "D-Bus に接続する際にエラー: %s"
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
-msgstr "%s のファイルシステム・サービス"
+msgstr "%s のファイルシステムサービス"
 
-#: ../daemon/daemon-main.c:116 ../programs/gvfs-copy.c:90
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "エラー: %s"
 
-#: ../daemon/daemon-main.c:162
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "用法: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:186 ../daemon/daemon-main.c:204
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "用法: %s key=value key=value ..."
 
-#: ../daemon/daemon-main.c:202
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "マウントの種類が指定されていません"
 
-#: ../daemon/daemon-main.c:272
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s 用のマウントポイントは既に使用中です"
 
-#: ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
-msgstr "マウント・デーモンを起動する際にエラー"
+msgstr "マウントデーモンを起動する際にエラー"
 
 #: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
 msgid "Got EOS"
-msgstr ""
+msgstr "EOS を受けとりました"
 
 #: ../daemon/gvfsafpserver.c:127
 msgid "Server doesn't support passwords longer than 256 characters"
-msgstr ""
+msgstr "サーバーは 256 文字より長いパスワードをサポートしていません"
 
 #: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
 msgid "An invalid username was provided"
-msgstr ""
+msgstr "有効ではないユーザー名が入力されました"
 
 #: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
 #, c-format
 msgid "AFP server %s declined the submitted password"
-msgstr ""
+msgstr "AFP サーバー %s が入力したパスワードを拒否しました"
 
 #: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
 #, c-format
 msgid "Login to AFP server %s failed"
-msgstr ""
+msgstr "AFP サーバー %s へのログインが失敗しました"
 
 #: ../daemon/gvfsafpserver.c:414
 msgid "Server doesn't support passwords longer than 64 characters"
-msgstr ""
+msgstr "サーバーは 64 文字より長いパスワードをサポートしていません"
 
 #: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
 #, c-format
 msgid "AFP server %s doesn't support anonymous login"
-msgstr ""
+msgstr "AFP サーバー %s は匿名でのログインをサポートしていません"
 
 #: ../daemon/gvfsafpserver.c:645
 #, c-format
 msgid "Anonymous login to AFP server %s failed, got error code: %d"
-msgstr ""
+msgstr "AFP サーバー %s への匿名ログインが失敗しました。エラーコード: %d"
 
 #: ../daemon/gvfsafpserver.c:669
 #, c-format
 msgid ""
 "Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
+"AFP サーバー %s へのログインが失敗しました (適切な認証方法が見つかりません)"
 
 #: ../daemon/gvfsafpserver.c:740
-#, fuzzy, c-format
-#| msgid "Failed to get folder list"
+#, c-format
 msgid "Failed to connect to server (%s)"
-msgstr "フォルダーの一覧を取得できませんでした"
+msgstr "サーバーに接続できませんでした (%s)"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsafpserver.c:830
-#, fuzzy, c-format
-#| msgid "Enter password for ftp as %s on %s"
+#, c-format
 msgid "Enter password for afp as %s on %s"
-msgstr "%s@%s のパスワードを入力指定ください"
+msgstr "%s$2 での %s$1 の afp パスワードを入力してください"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsafpserver.c:833
-#, fuzzy, c-format
-#| msgid "Enter password for ftp on %s"
+#, c-format
 msgid "Enter password for afp on %s"
-msgstr "FTP@%s のパスワードを入力指定ください"
+msgstr "%s での afp パスワードを入力してください"
 
 #: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
 #: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
 #: ../daemon/gvfsbackendsmb.c:619
 msgid "Password dialog cancelled"
-msgstr "パスワード・ダイアログがキャンセルしました"
+msgstr "パスワードダイアログがキャンセルしました"
 
-#: ../daemon/gvfsbackendafc.c:212
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Apple ファイルコントロールの内部エラー"
 
-#: ../daemon/gvfsbackendafc.c:216 ../daemon/gvfsbackendftp.c:736
+#: ../daemon/gvfsbackendafc.c:213 ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "ファイルが存在しません"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "ディレクトリが空ではありません"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "デバイスが応答していません"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "接続に割り込みがありました"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "無効な Apple ファイルコントロールデータを受信しました"
 
-#: ../daemon/gvfsbackendafc.c:236
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Apple ファイルコントロールの処理できないエラー (%d)"
 
-#: ../daemon/gvfsbackendafc.c:252
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
-msgstr ""
+msgstr "デバイスにインストールされたアプリケーション一覧の作成に失敗しました"
 
-#: ../daemon/gvfsbackendafc.c:268
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
-msgstr ""
+msgstr "デバイスのアプリケーションアイコンへのアクセスに失敗しました"
 
-#: ../daemon/gvfsbackendafc.c:285
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
-msgstr "ロックダウン・エラー: 引数が間違っています"
+msgstr "ロックダウンエラー: 引数が間違っています"
 
-#: ../daemon/gvfsbackendafc.c:289 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafc.c:286 ../daemon/gvfsbackendafp.c:463
 #: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
 #: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
 #: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
 #: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
 #: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
 #: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
-#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:400
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "権限がありません"
 
-#: ../daemon/gvfsbackendafc.c:293
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
-msgstr "処理できないロックダウン・エラー (%d)"
+msgstr "処理できないロックダウンエラー (%d)"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "libimobiledevice エラー: 無効な引数"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:311
 msgid ""
 "libimobiledevice Error: No device found. Make sure usbmuxd is set up "
 "correctly."
@@ -397,50 +396,49 @@ msgstr ""
 "libimobiledevice エラー: デバイスが見つかりません。usbmuxd が正しく設定されて"
 "いるか確認してください。"
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "libimobiledevice の処理できないエラー (%d)"
 
-#: ../daemon/gvfsbackendafc.c:385 ../daemon/gvfsbackend.c:963
-#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:922
-msgid "Cancel"
-msgstr "キャンセル"
-
-#: ../daemon/gvfsbackendafc.c:385
+#: ../daemon/gvfsbackendafc.c:382
 msgid "Try again"
 msgstr "もう一度試す"
 
-#: ../daemon/gvfsbackendafc.c:403 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendafc.c:382 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "キャンセル"
+
+#: ../daemon/gvfsbackendafc.c:400 ../daemon/gvfsbackendarchive.c:550
 #: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
-#: ../daemon/gvfsbackendhttp.c:302 ../daemon/gvfsbackendobexftp.c:861
-#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendobexftp.c:896
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "マウントの仕様が間違っています"
 
-#: ../daemon/gvfsbackendafc.c:409 ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:406 ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr ""
 "AFC の場所が間違っています: afc://uuid:port-number の形式である必要があります"
 
-#: ../daemon/gvfsbackendafc.c:425
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Apple モバイルデバイス"
 
-#: ../daemon/gvfsbackendafc.c:430
-#, fuzzy, c-format
-#| msgid "Apple Mobile Device"
+#: ../daemon/gvfsbackendafc.c:427
+#, c-format
 msgid "Apple Mobile Device, Jailbroken"
-msgstr "Apple モバイルデバイス"
+msgstr "Apple モバイルデバイス (Jailbrake 済)"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Apple モバイルデバイス上のドキュメント"
 
-#: ../daemon/gvfsbackendafc.c:493
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (jailbreak)"
@@ -448,7 +446,7 @@ msgstr "%s (jailbreak)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:500 ../monitor/afc/afcvolume.c:125
+#: ../daemon/gvfsbackendafc.c:497 ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
 msgstr "%s 上のドキュメント"
@@ -459,14 +457,14 @@ msgstr "%s 上のドキュメント"
 #: ../daemon/gvfsbackendafc.c:579
 #, c-format
 msgid ""
-"Device '%s' is password protected. Enter the password 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:918 ../daemon/gvfsbackendarchive.c:655
-#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
@@ -498,7 +496,7 @@ msgstr "無効なシークの種類です"
 #: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
 #: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
 #: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
-#: ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "サポートしていない操作です"
 
@@ -514,7 +512,7 @@ msgstr "サポートしていない操作です"
 #: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
 #, c-format
 msgid "Got error code: %d from server"
-msgstr ""
+msgstr "サーバーがエラーコードを返しました: %d"
 
 #: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
 #: ../daemon/gvfsbackendsmbbrowse.c:1135
@@ -522,16 +520,14 @@ msgid "The file is not a mountable"
 msgstr "そのファイルはマウントできません"
 
 #: ../daemon/gvfsbackendafpbrowse.c:498
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "AFP shares for %s on %s"
-msgstr "sftp (%s@%s)"
+msgstr "%s$2 上の %s$1 の AFP 共有"
 
 #: ../daemon/gvfsbackendafpbrowse.c:501
-#, fuzzy, c-format
-#| msgid "Windows shares on %s"
+#, c-format
 msgid "AFP shares on %s"
-msgstr "Windows 共有@%s"
+msgstr "%s 上の AFP 共有"
 
 #: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
 #: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
@@ -541,30 +537,26 @@ msgstr "ホスト名が指定されていません"
 
 #: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
 msgid "Apple Filing Protocol Service"
-msgstr ""
+msgstr "Apple ファイルプロトコルサービス"
 
 #: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
 #: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
-#, fuzzy
-#| msgid "File is directory"
 msgid "File is a directory"
 msgstr "ファイルはディレクトリです"
 
 #: ../daemon/gvfsbackendafp.c:475
 msgid "Too many files open"
-msgstr ""
+msgstr "ファイルを開き過ぎています"
 
 #: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
 #: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
 #: ../daemon/gvfsbackendafp.c:2969
 msgid "Not enough space on volume"
-msgstr ""
+msgstr "ボリュームに空き容量がありません"
 
 #: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
-#, fuzzy
-#| msgid "Target file exists"
 msgid "Target file is open"
-msgstr "転送先にファイルが存在します"
+msgstr "対象のファイルはオープンされています"
 
 #: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
 #: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
@@ -577,16 +569,14 @@ msgid "Target file already exists"
 msgstr "対象のファイルが既に存在しています"
 
 #: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Ancestor directory doesn't exist"
-msgstr "ファイルがありません"
+msgstr "親ディレクトリが存在しません"
 
 #: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
 #: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
 #: ../daemon/gvfsbackendafp.c:2366
 msgid "Volume is read-only"
-msgstr ""
+msgstr "ボリュームは読み取り専用です"
 
 #: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
 #: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
@@ -595,66 +585,54 @@ msgstr "ディレクトリが空ではありません"
 
 #: ../daemon/gvfsbackendafp.c:1215
 msgid "Target object is marked as DeleteInhibit"
-msgstr ""
+msgstr "対象のオブジェクトは DeleteInhibit とマークされています"
 
 #: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
 #: ../daemon/gvfsbackendafp.c:2226
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Target object doesn't exist"
-msgstr "ファイルがありません"
+msgstr "対象のオブジェクトがありません"
 
 #: ../daemon/gvfsbackendafp.c:1319
 msgid "ID not found"
-msgstr ""
+msgstr "ID が見つかりません"
 
 #: ../daemon/gvfsbackendafp.c:1452
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move directory into one of it's descendants"
-msgstr "ディレクトリをディレクトリの外に移動できません"
+msgstr "ディレクトリは子ディレクトリに移動できません"
 
 #: ../daemon/gvfsbackendafp.c:1456
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move sharepoint into a shared directory"
-msgstr "ディレクトリをディレクトリの外に移動できません"
+msgstr "共有ポイントを共有ディレクトリ内に移動できません"
 
 #: ../daemon/gvfsbackendafp.c:1460
-#, fuzzy
-#| msgid "Can't move directory over directory"
 msgid "Can't move a shared directory into the Trash"
-msgstr "ディレクトリをディレクトリの外に移動できません"
+msgstr "共有ディレクトリはゴミ箱に移動できません"
 
 #: ../daemon/gvfsbackendafp.c:1468
 msgid "Object being moved is marked as RenameInhibit"
-msgstr ""
+msgstr "移動しているオブジェクトは RenameInhibit とマークされています"
 
 #: ../daemon/gvfsbackendafp.c:1472
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Object being moved doesn't exist"
-msgstr "ファイルがありません"
+msgstr "移動しているオブジェクトが存在しません"
 
 #: ../daemon/gvfsbackendafp.c:1581
 msgid "Server doesn't support the FPCopyFile operation"
-msgstr ""
+msgstr "サーバーは FPCopyFile 操作をサポートしていません"
 
 #: ../daemon/gvfsbackendafp.c:1585
-#, fuzzy
-#| msgid "Couldn't get stream file descriptor"
 msgid "Couldn't open source file as Read/DenyWrite"
-msgstr "ストリーム・ファイルのディスクリプターを取得できませんでした"
+msgstr "コピー元のファイルを Read/DenyWrite でオープンできません"
 
 #: ../daemon/gvfsbackendafp.c:1597
 msgid "Source file and/or destination directory doesn't exist"
 msgstr ""
+"コピー元のファイルおよびコピー先のディレクトリのいずれか、または両方が存在し"
+"ません。"
 
 #: ../daemon/gvfsbackendafp.c:1601
-#, fuzzy
-#| msgid "The file is not a directory"
 msgid "Source file is a directory"
-msgstr "そのファイルはディレクトリではありません"
+msgstr "コピー元ファイルはディレクトリです"
 
 #: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
 #: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
@@ -679,48 +657,41 @@ msgid "Can't move directory over directory"
 msgstr "ディレクトリをディレクトリの外に移動できません"
 
 #: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
-#, fuzzy
-#| msgid "Can't eject file"
 msgid "Can't rename volume"
-msgstr "ファイルを取り出せません"
+msgstr "ボリュームの名前を変更できません"
 
 #: ../daemon/gvfsbackendafp.c:2218
-#, fuzzy
-#| msgid "Name already exists"
 msgid "Object with that name already exists"
-msgstr "既に存在しています"
+msgstr "その名前のオブジェクトは既に存在しています"
 
 #: ../daemon/gvfsbackendafp.c:2222
 msgid "Target object is marked as RenameInhibit"
-msgstr ""
+msgstr "対象のオブジェクトは RenameInhibit とマークされています"
 
 #: ../daemon/gvfsbackendafp.c:2354
 msgid "Volume is flat and doesn't support directories"
-msgstr ""
+msgstr "ボリュームはフラットで、ディレクトリをサポートしていません"
 
 #: ../daemon/gvfsbackendafp.c:2362
-#, fuzzy
-#| msgid "Target file already exists"
 msgid "Target directory already exists"
-msgstr "対象のファイルが既に存在しています"
+msgstr "対象のディレクトリが既に存在しています"
 
 #: ../daemon/gvfsbackendafp.c:2501
 msgid "File is not open for write access"
-msgstr ""
+msgstr "書き込みアクセスに対してファイルがオープンされません"
 
 #: ../daemon/gvfsbackendafp.c:2742
 msgid "File is not open for read access"
-msgstr ""
+msgstr "読み取りアクセスに対してファイルがオープンされません"
 
 #: ../daemon/gvfsbackendafp.c:2973
 msgid "Range lock conflict exists"
-msgstr ""
+msgstr "Range lock conflict が存在します"
 
 #: ../daemon/gvfsbackendafp.c:3212
-#, fuzzy, c-format
-#| msgid "Unable to create temporary file"
+#, c-format
 msgid "Couldn't create temporary file (%s)"
-msgstr "作業ファイルを生成できません"
+msgstr "一時作業ファイルを生成できません (%s)"
 
 #: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
 #: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
@@ -730,19 +701,15 @@ msgstr "そのファイルは他のプロセスで変更されました"
 #: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
 #: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
 msgid "backups not supported yet"
-msgstr "バックエンドは未だサポートしていません"
+msgstr "バックアップはまだサポートされていません"
 
 #: ../daemon/gvfsbackendafp.c:3539
-#, fuzzy
-#| msgid "File doesn't exist"
 msgid "Directory doesn't exist"
-msgstr "ファイルがありません"
+msgstr "ディレクトリが存在していません"
 
 #: ../daemon/gvfsbackendafp.c:3543
-#, fuzzy
-#| msgid "Target %s is not a directory\n"
 msgid "Target object is not a directory"
-msgstr "ターゲット %s はディレクトリではありません\n"
+msgstr "対象のオブジェクトはディレクトリではありません"
 
 #: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
 #: ../daemon/gvfsbackendsftp.c:4643
@@ -750,46 +717,40 @@ msgid "Invalid attribute type (uint32 expected)"
 msgstr "無効な属性タイプ (uint32 であるべき)"
 
 #: ../daemon/gvfsbackendafp.c:4093
-#, fuzzy
-#| msgid "Not supported"
 msgid "Command not supported"
-msgstr "サポートしていません"
+msgstr "サポートされていないコマンドです"
 
 #: ../daemon/gvfsbackendafp.c:4097
 msgid "User's password has expired"
-msgstr ""
+msgstr "ユーザーのパスワード期限が切れました"
 
 #: ../daemon/gvfsbackendafp.c:4101
 msgid "User's password needs to be changed"
-msgstr ""
+msgstr "ユーザーのパスワードを変更する必要があります"
 
 #: ../daemon/gvfsbackendafp.c:4111
 #, c-format
 msgid "FPGetUserInfo failed (%s)"
-msgstr ""
+msgstr "FPGetUserInfo が失敗しました (%s)"
 
 #: ../daemon/gvfsbackendafp.c:4250
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "AFP volume %s for %s on %s"
-msgstr "sftp (%s@%s)"
+msgstr "%s$3 上の %s$2 の AFP ボリューム %s$1"
 
 #: ../daemon/gvfsbackendafp.c:4254
-#, fuzzy, c-format
-#| msgid "Documents on %s"
+#, c-format
 msgid "AFP volume %s on %s"
-msgstr "%s 上のドキュメント"
+msgstr "%s$1 上の AFP ボリューム %s$2"
 
 #: ../daemon/gvfsbackendafp.c:4272
 #, c-format
 msgid "Couldn't mount AFP volume %s on %s"
-msgstr ""
+msgstr "%s$2 上の AFP ボリューム %s$1 をマウントできません"
 
 #: ../daemon/gvfsbackendafp.c:4303
-#, fuzzy
-#| msgid "No drive specified"
 msgid "No volume specified"
-msgstr "ドライブが指定されていません"
+msgstr "ボリュームが指定されていません"
 
 #. FIXME: this should really be "/ in %s", but can't change
 #. due to string freeze.
@@ -814,15 +775,15 @@ msgstr "Burn"
 
 #: ../daemon/gvfsbackendburn.c:376
 msgid "Unable to create temporary directory"
-msgstr "作業ディレクトリを生成できません"
+msgstr "一時作業ディレクトリを生成できません"
 
 #: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
 #: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1207 ../daemon/gvfsbackendgphoto2.c:2133
-#: ../daemon/gvfsbackendgphoto2.c:2852 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
 #: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
@@ -842,7 +803,7 @@ msgstr "CD/DVD クリエーター"
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2926
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "ファイルが存在しています"
 
@@ -865,7 +826,7 @@ msgstr "ファイルが存在しています"
 #: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
 #: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173 ../monitor/gdu/ggdumount.c:1257
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
 #: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "バックエンドでサポートしていない操作です"
@@ -881,16 +842,16 @@ msgid "Target file exists"
 msgstr "転送先にファイルが存在します"
 
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2506 ../daemon/gvfsbackendgphoto2.c:2715
-#: ../daemon/gvfsbackendgphoto2.c:2812 ../daemon/gvfsbackendgphoto2.c:2905
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "サポートしていません"
 
-#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:921
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
 msgid "Unmount Anyway"
 msgstr "とにかくアンマウントする"
 
-#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:923
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -898,19 +859,19 @@ msgstr ""
 "ボリュームは使用中です\n"
 "1つ以上のアプリケーションがボリュームを使用中です。"
 
-#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "gudev クライアントを生成できません"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
-msgstr "システム・バスに接続できません"
+msgstr "システムバスに接続できません"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "libhal のコンテキストを生成できません"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "libhal を初期化できません"
 
@@ -940,7 +901,7 @@ msgstr "cdda が %s にマウントしました"
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
-msgstr "オーディオ・ディスク"
+msgstr "オーディオディスク"
 
 #: ../daemon/gvfsbackendcdda.c:504
 #, c-format
@@ -964,7 +925,7 @@ msgstr "ドライブ (%s) の 'paranoia' でエラー"
 msgid "Error seeking in stream on drive %s"
 msgstr "ドライブ (%s) のストリームをシークする際にエラー"
 
-#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1820
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "そのようなファイルは存在しません"
@@ -972,11 +933,11 @@ msgstr "そのようなファイルは存在しません"
 #: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
-msgstr "そのファイルは存在しないか、もしくはオーディオ・トラックではありません"
+msgstr "そのファイルは存在しないか、もしくはオーディオトラックではありません"
 
 #: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
-msgstr "オーディオ CD のファイルシステム・サービス"
+msgstr "オーディオ CD のファイルシステムサービス"
 
 #: ../daemon/gvfsbackendcomputer.c:192 ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
@@ -1000,8 +961,6 @@ msgid "Can't mount file"
 msgstr "ファイルをマウントできません"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-#, fuzzy
-#| msgid "No media in the drive"
 msgid "No medium in the drive"
 msgstr "ドライブにメディアが挿入されていません"
 
@@ -1035,22 +994,20 @@ msgstr "ファイルをpollできません"
 #. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
 #. the second %s and only shown if it is not the default http(s) port.
 #: ../daemon/gvfsbackenddav.c:485
-#, fuzzy, c-format
-#| msgid "WebDAV on %s"
+#, c-format
 msgid "WebDAV as %s on %s%s"
-msgstr "%s での WebDAV 共有"
+msgstr "%s$2%s$3 での %s$1 の 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
-#, fuzzy, c-format
-#| msgid "WebDAV on %s"
+#, c-format
 msgid "WebDAV on %s%s"
-msgstr "%s での WebDAV 共有"
+msgstr "%s%s での WebDAV 共有"
 
 #: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP のエラー: %s"
@@ -1097,7 +1054,7 @@ msgstr "要求メッセージを生成できませんでした"
 #: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
 #: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
-msgstr "バックアップ・ファイルの生成に失敗しました"
+msgstr "バックアップファイルの生成に失敗しました"
 
 #. "separate": a link to dns-sd://local/
 #: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
@@ -1120,30 +1077,26 @@ msgstr "ネットワーク"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendftp.c:488
-#, fuzzy, c-format
-#| msgid "Enter password for ftp as %s on %s"
+#, c-format
 msgid "Enter password for FTP as %s on %s"
-msgstr "%s@%s のパスワードを入力指定ください"
+msgstr "%s$2 での %s$1 の FTP パスワードを入力してください"
 
 #. translators: %s here is the hostname
 #: ../daemon/gvfsbackendftp.c:491
-#, fuzzy, c-format
-#| msgid "Enter password for ftp on %s"
+#, c-format
 msgid "Enter password for FTP on %s"
-msgstr "FTP@%s のパスワードを入力指定ください"
+msgstr "%s の FTP パスワードを入力してください"
 
 #: ../daemon/gvfsbackendftp.c:630
-#, fuzzy, c-format
-#| msgid "/ on %s"
+#, c-format
 msgid "FTP on %s"
-msgstr "%s の / (ルート)"
+msgstr "%s の FTP"
 
 #. Translators: the first %s is the username, the second the host name
 #: ../daemon/gvfsbackendftp.c:634
-#, fuzzy, c-format
-#| msgid "ftp as %s on %s"
+#, c-format
 msgid "FTP as %s on %s"
-msgstr "ftp (%s@%s)"
+msgstr "%s$2 で %s$1 として FTP"
 
 #: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
@@ -1170,14 +1123,14 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: 未サポートです"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720 ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
-msgstr "デジカメ (%s)"
+msgstr "デジタルカメラ (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:949 ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../daemon/gvfsbackendgphoto2.c:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -1185,181 +1138,173 @@ msgstr "%s 製のカメラ"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
-msgstr "%s 製のオーディオ・プレイヤー"
+msgstr "%s 製のオーディオプレイヤー"
 
-#: ../daemon/gvfsbackendgphoto2.c:961 ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "カメラ"
 
-#: ../daemon/gvfsbackendgphoto2.c:963 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
-msgstr "オーディオ・プレイヤー"
+msgstr "オーディオプレイヤー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "デバイスが指定されていません"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "gphoto2 のコンテキストを生成できません"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
-msgstr "カメラ・オブジェクトを生成できません"
+msgstr "カメラオブジェクトを生成できません"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613 ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "デバイス情報を読み込む際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "デバイス情報を検索する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "デバイス情報を取得する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "カメラに接続するポートを設定する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 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:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 が %s にマウントしました"
 
-#: ../daemon/gvfsbackendgphoto2.c:1766
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "カメラが指定されていません"
 
-#: ../daemon/gvfsbackendgphoto2.c:1828
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "ファイル・オブジェクトを生成する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1843
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "ファイルを取得する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1853
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "ファイルのデータを取得する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:1911
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "アイコンの識別子の形式が間違っています: '%s'"
 
-#: ../daemon/gvfsbackendgphoto2.c:1987 ../daemon/gvfsbackendgphoto2.c:3176
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "カメラ (%s) のストリームを検索する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2127 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "ディレクトリではありません"
 
-#: ../daemon/gvfsbackendgphoto2.c:2160
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "フォルダーの一覧を取得できませんでした"
 
-#: ../daemon/gvfsbackendgphoto2.c:2226
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "ファイルの一覧を取得できませんでした"
 
-#: ../daemon/gvfsbackendgphoto2.c:2518
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "ディレクトリを生成する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2727
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "既に存在しています"
 
-#: ../daemon/gvfsbackendgphoto2.c:2738 ../daemon/gvfsbackendgphoto2.c:3367
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "新しい名前が長すぎます"
 
-#: ../daemon/gvfsbackendgphoto2.c:2748 ../daemon/gvfsbackendgphoto2.c:3378
-#, fuzzy
-#| msgid "Error creating directory"
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
-msgstr "ディレクトリを生成する際にエラー"
+msgstr "ディレクトリ名を変更する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2761 ../daemon/gvfsbackendgphoto2.c:3391
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "ファイル名を変更する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2825
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "ディレクトリ (%s) は空ではありません"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "ディレクトリを削除する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2862
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "ファイルを削除する際にエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "ディレクトリに書き込めません"
 
-#: ../daemon/gvfsbackendgphoto2.c:2962
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "追加先の新しいファイルを確保できません"
 
-#: ../daemon/gvfsbackendgphoto2.c:2977
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "追加先のファイルを読み込めません"
 
-#: ../daemon/gvfsbackendgphoto2.c:2988
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "追加先のファイルのデータを取得できません"
 
-#: ../daemon/gvfsbackendgphoto2.c:3275
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "ファイルの書き込みでエラー"
 
-#: ../daemon/gvfsbackendgphoto2.c:3323
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "未サポートです (同じディレクトリではありません)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3335
-#, fuzzy
-#| msgid "Not supported (src is dir, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
 msgid ""
 "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "未サポートです (転送元と転送先の双方がディレクトリ)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3343
-#, fuzzy
-#| msgid "Not supported (src is dir, dst is existing file)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
 msgid ""
 "Not supported (the source is a directory, but the destination is an existing "
 "file)"
-msgstr "未サポートです (転送元がディレクトリで転送先がファイル)"
+msgstr "未サポートです (転送元がディレクトリで転送先にファイルが存在)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3355
-#, fuzzy
-#| msgid "Not supported (src is file, dst is dir)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
 msgid ""
 "Not supported (the source is a file, but the destination is a directory)"
 msgstr "未サポートです (転送元がファイルで転送先がディレクトリ)"
 
-#: ../daemon/gvfsbackendhttp.c:244
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP クライアントのエラー: %s"
@@ -1385,17 +1330,15 @@ msgstr "ネットワークの場所の監視"
 #. lead to G_IO_ERROR_NOT_MOUNTED errors
 #.
 #. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
-#: ../daemon/gvfsbackendobexftp.c:681 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
-msgstr "%s@%s"
+msgstr "%s$2 上の %s$1"
 
-#: ../daemon/gvfsbackendobexftp.c:890
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
-msgstr ""
-"USB をサポートしていません; 本ライブラリを提供しているベンダーに問い合わせて"
-"ください"
+msgstr "USB をサポートしていません; ソフトウェアベンダーに問い合わせてください"
 
 #: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
@@ -1403,7 +1346,7 @@ msgstr "デバイスへの接続が失われました"
 
 #: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
-msgstr "デバイス・ソフトウェアを更新してください"
+msgstr "デバイスはソフトウェアの更新が必要です"
 
 #: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
 #, c-format
@@ -1497,7 +1440,7 @@ msgstr ""
 
 #: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
-msgstr "ログイン・ダイアログがキャンセルしました"
+msgstr "ログインのダイアログがキャンセルされました"
 
 #: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
@@ -1509,17 +1452,15 @@ msgstr "プロトコルのエラーです"
 
 #. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1691
-#, fuzzy, c-format
-#| msgid "sftp for %s on %s"
+#, c-format
 msgid "SFTP for %s on %s"
-msgstr "sftp (%s@%s)"
+msgstr "%s$2 で %s$1 として SFTP"
 
 #. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
 #: ../daemon/gvfsbackendsftp.c:1694
-#, fuzzy, c-format
-#| msgid "/ on %s"
+#, c-format
 msgid "SFTP on %s"
-msgstr "%s の / (ルート)"
+msgstr "%s 上の SFTP"
 
 #: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
@@ -1543,12 +1484,12 @@ msgstr "ssh コマンドが見つかりません"
 #: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
 #: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
-msgstr "受信したリプライが間違っています"
+msgstr "無効なリプライを受信しました"
 
 #: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
 #: ../daemon/gvfsdaemonutils.c:211
 msgid " (invalid encoding)"
-msgstr " (エンコーディングが間違っています)"
+msgstr " (無効なエンコーディング)"
 
 #: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
@@ -1562,11 +1503,11 @@ msgstr "OpenIconForRead において icon_id が正しくありません: '%s'"
 #: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
-msgstr "バックアップ・ファイルを生成する際にエラー: %s"
+msgstr "バックアップファイルを生成する際にエラー: %s"
 
 #: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
-msgstr "作業ファイルを生成できません"
+msgstr "一時作業ファイルを生成できません"
 
 #. translators: %s is a server name
 #: ../daemon/gvfsbackendsmbbrowse.c:375
@@ -1579,7 +1520,7 @@ msgstr "%s のパスワードを入力してください"
 #: ../daemon/gvfsbackendsmbbrowse.c:902
 #, c-format
 msgid "Windows shares on %s"
-msgstr "Windows 共有@%s"
+msgstr "%s 上のWindows 共有"
 
 #. translators: We tried to mount a windows (samba) share, but failed
 #: ../daemon/gvfsbackendsmbbrowse.c:1001
@@ -1588,11 +1529,11 @@ msgstr "サーバーから共有リストを取得できませんでした"
 
 #: ../daemon/gvfsbackendsmbbrowse.c:1157
 msgid "Not a regular file"
-msgstr "通常ファイルではありません"
+msgstr "通常のファイルではありません"
 
 #: ../daemon/gvfsbackendsmbbrowse.c:1489
 msgid "Windows Network Filesystem Service"
-msgstr "Windows ネットワークのファイルシステム・サービス"
+msgstr "Windows ネットワークのファイルシステムサービス"
 
 #. translators: First %s is a share name, second is a server name
 #: ../daemon/gvfsbackendsmb.c:238
@@ -1618,17 +1559,15 @@ msgstr "サポートしていないシークの種類です"
 #: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
-msgstr "バックアップ・ファイルの生成に失敗しました: %s"
+msgstr "バックアップファイルの生成に失敗しました: %s"
 
 #: ../daemon/gvfsbackendsmb.c:1734
 msgid "Invalid attribute type (uint64 expected)"
 msgstr "無効な属性タイプ (uint64 であるべき)"
 
 #: ../daemon/gvfsbackendsmb.c:1922
-#, fuzzy
-#| msgid "Target file already exists"
 msgid "Can't rename file, filename already exists"
-msgstr "対象のファイルが既に存在しています"
+msgstr "ファイルの名前を変更できません。ファイルが既に存在しています"
 
 #: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
@@ -1646,7 +1585,7 @@ msgstr "ディレクトリを再帰的に移動できません"
 
 #: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
-msgstr "Windows 共有のファイルシステム・サービス"
+msgstr "Windows 共有のファイルシステムサービス"
 
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
@@ -1662,32 +1601,31 @@ msgstr "ゴミ箱の中にあるアイテムは変更できません"
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
-msgstr "バックエンドの種類が間違っています"
+msgstr "無効なバックエンドの種類"
 
 #: ../daemon/gvfsdaemonutils.c:104
-#, fuzzy, c-format
-#| msgid "Error sending fd: %s"
+#, c-format
 msgid "Error sending file descriptor: %s"
-msgstr "fd を送信する際にエラー: %s"
+msgstr "ファイルディスクリプターを送信する際にエラー: %s"
 
 #: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
 msgstr "予期せぬストリームの末尾です"
 
 #: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412 ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
-msgstr "リプライが間違っています"
+msgstr "無効なリプライ"
 
 #: ../daemon/gvfsftpconnection.c:392
 msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
 msgstr ""
-"アクティブな FTP 接続を作成できません。おそらくルータがこれをサポートしていな"
-"い可能性があります。"
+"アクティブな FTP 接続を作成できません。おそらくルーターがこれをサポートしてい"
+"ない可能性があります。"
 
 #: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
@@ -1697,47 +1635,47 @@ msgstr "アクティブな FTP 接続を作成できませんでした。"
 msgid "Filename contains invalid characters."
 msgstr "ファイル名に無効な文字が含まれています。"
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP サーバーがビジーです。後でもう一度試してください。"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "アカウントがサポートされていません"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "ホストが接続を閉じました"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr ""
-"データの接続を開始できません (おそらくファイヤーウォールが邪魔していると思わ"
-"れます)"
+"データの接続を開始できません (おそらくファイアウォールが邪魔していると思われ"
+"ます)"
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "データの接続を閉じました"
 
-#: ../daemon/gvfsftptask.c:375 ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "操作が失敗しました"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "サーバーの容量が足りません"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "サポートしていないネットワークプロトコルです"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "ページの種類が不明です"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
-msgstr "ファイル名が間違っています"
+msgstr "ファイル名が無効です"
 
 #: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
@@ -1745,7 +1683,7 @@ msgstr "バックエンドはシンボリックリンクをサポートしてい
 
 #: ../daemon/gvfsjobsetattribute.c:120
 msgid "Invalid dbus message"
-msgstr "D-Bus のメッセージが間違っています"
+msgstr "無効な D-Bus のメッセージ"
 
 #: ../daemon/gvfsjobunmount.c:156
 msgid "Filesystem is busy"
@@ -1759,22 +1697,22 @@ msgstr "古いデーモンを置きかえる"
 msgid "Don't start fuse."
 msgstr "fuse を起動しない"
 
-#: ../daemon/main.c:62
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS デーモン"
 
-#: ../daemon/main.c:65
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
-msgstr "GVFS のメイン・デーモン"
+msgstr "GVFS のメインデーモン"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:80 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:82 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
 #: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
 #: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
@@ -1796,7 +1734,7 @@ msgstr "fork() した子プロセスの引数が間違っています"
 msgid "Automount failed: %s"
 msgstr "自動マウントに失敗しました: %s"
 
-#: ../daemon/mount.c:825 ../daemon/mount.c:902
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "指定した場所はマウントされていません"
 
@@ -1804,11 +1742,11 @@ msgstr "指定した場所はマウントされていません"
 msgid "The specified location is not supported"
 msgstr "指定した場所はサポートされていません"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "その場所は既にマウントされています"
 
-#: ../daemon/mount.c:1052
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "その場所はマウントできません"
 
@@ -1837,11 +1775,11 @@ msgstr "メタデータの値を移動できませんでした"
 
 #: ../metadata/meta-daemon.c:704
 msgid "GVFS Metadata Daemon"
-msgstr "GVFS メタデータ・デーモン"
+msgstr "GVFS メタデータデーモン"
 
 #: ../metadata/meta-daemon.c:707
 msgid "Metadata daemon for GVFS"
-msgstr "GVFS のメタデータ・デーモン"
+msgstr "GVFS のメタデータデーモン"
 
 #: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
 msgid "GVfs GDU Volume Monitor"
@@ -1849,7 +1787,7 @@ msgstr "GVfs GDU ボリュームの監視"
 
 #: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
-msgstr "フロッピー・ドライブ"
+msgstr "フロッピードライブ"
 
 #: ../monitor/gdu/ggdudrive.c:258
 #, c-format
@@ -1861,8 +1799,7 @@ msgid "Unnamed Drive"
 msgstr "名前のないドライブ"
 
 #: ../monitor/gdu/ggdudrive.c:561
-#, fuzzy, c-format
-#| msgid "Failed to eject media; one or more volumes on the media are busy."
+#, c-format
 msgid "Failed to eject medium; one or more volumes on the medium are busy."
 msgstr ""
 "メディアを取り出せませんでした (メディアで1つ以上のボリュームが使用中です)"
@@ -1873,31 +1810,31 @@ msgid ""
 "Starting a drive in degraded mode means that the drive is no longer tolerant "
 "to failures. Data on the drive may be irrevocably lost if a component fails."
 msgstr ""
-"ドライブをデグレード・モードで開始しますか?\n"
-"ドライブをデグレード・モードで開始するということは、もはやドライブに故障時の"
-"耐障害性がないことを意味します。コンポーネントが故障した場合は、ドライブにあ"
-"るデータを回復できず失ってしまう可能性があります。"
+"ドライブをデグレードモードで開始しますか?\n"
+"ドライブをデグレードモードで開始するということは、もはやドライブに故障時の耐"
+"障害性がないことを意味します。コンポーネントが故障した場合は、ドライブにある"
+"データを回復できず失ってしまう可能性があります。"
 
 #: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "とにかく開始する"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "アンマウント操作を妨げるプログラムが1つ以上あります。"
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "LUKS cleartext slave を取得できませんでした"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "パス `%s' から LUKS cleartext slave を取得できませんでした"
 
 #: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
-msgstr "フロッピー・ディスク"
+msgstr "フロッピーディスク"
 
 #: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
@@ -2168,19 +2105,19 @@ msgstr "FireWire ドライブ"
 
 #: ../monitor/hal/ghaldrive.c:197
 msgid "Tape Drive"
-msgstr "テープ・ドライブ"
+msgstr "テープドライブ"
 
 #: ../monitor/hal/ghaldrive.c:199
 msgid "CompactFlash Drive"
-msgstr "CompactFlash ドライブ"
+msgstr "コンパクトフラッシュドライブ"
 
 #: ../monitor/hal/ghaldrive.c:201
 msgid "MemoryStick Drive"
-msgstr "MemoryStick ドライブ"
+msgstr "メモリースティックドライブ"
 
 #: ../monitor/hal/ghaldrive.c:203
 msgid "SmartMedia Drive"
-msgstr "SmartMedia ドライブ"
+msgstr "スマートメディアドライブ"
 
 #: ../monitor/hal/ghaldrive.c:205
 msgid "SD/MMC Drive"
@@ -2200,7 +2137,7 @@ msgstr "Thumb ドライブ"
 
 #: ../monitor/hal/ghaldrive.c:214
 msgid "Mass Storage Drive"
-msgstr "マスストレージ・ドライブ"
+msgstr "大容量ストレージドライブ"
 
 #: ../monitor/hal/ghaldrive.c:662
 #, c-format
@@ -2229,10 +2166,9 @@ msgstr "楽曲とデータの混合ディスク"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
 #: ../monitor/hal/ghalmount.c:336
-#, fuzzy, c-format
-#| msgid "%s Media"
+#, c-format
 msgid "%s Medium"
-msgstr "%s のメディア"
+msgstr "%s メディア"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -2513,54 +2449,54 @@ msgstr "- <場所> のファイルを一覧表示"
 
 #: ../programs/gvfs-mime.c:36
 msgid "Query handler for mime-type"
-msgstr ""
+msgstr "MIME型のクエリハンドラー"
 
 #: ../programs/gvfs-mime.c:37
 msgid "Set handler for mime-type"
-msgstr ""
+msgstr "MIME型のハンドラーを設定"
 
 #: ../programs/gvfs-mime.c:76
 msgid "- get/set handler for <mimetype>"
-msgstr ""
+msgstr "- <MIME型> のハンドラーを取得・設定"
 
 #: ../programs/gvfs-mime.c:85
 msgid "Specify one of --query and --set"
-msgstr ""
+msgstr "--query か --set のいずれか一つを指定"
 
 #: ../programs/gvfs-mime.c:97
 #, c-format
 msgid "Must specify a single mime-type.\n"
-msgstr ""
+msgstr "単一の MIME 型を指定する必要があります。\n"
 
 #: ../programs/gvfs-mime.c:105
 #, c-format
 msgid "Must specify the mime-type followed by the default handler.\n"
-msgstr ""
+msgstr "MIME型に続いてデフォルトのハンドラーを指定しなくてはなりません。\n"
 
 #: ../programs/gvfs-mime.c:121
 #, c-format
 msgid "No default applications for '%s'\n"
-msgstr ""
+msgstr "'%s' 用の標準アプリケーションは設定されていません\n"
 
 #: ../programs/gvfs-mime.c:127
 #, c-format
 msgid "Default application for '%s': %s\n"
-msgstr ""
+msgstr "'%s' 用の標準アプリケーション: %s\n"
 
 #: ../programs/gvfs-mime.c:132
 #, c-format
 msgid "Registered applications:\n"
-msgstr ""
+msgstr "登録されているアプリケーション:\n"
 
 #: ../programs/gvfs-mime.c:152
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
-msgstr ""
+msgstr "ハンドラー '%s' の情報を読み込めませんでした\n"
 
 #: ../programs/gvfs-mime.c:158
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
-msgstr ""
+msgstr "'%s' を '%s' のデフォルトのハンドラーとして設定できませんでした: %s\n"
 
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
@@ -2623,22 +2559,22 @@ msgstr "マウントを解除する際にエラー: %s\n"
 msgid "Error finding enclosing mount: %s\n"
 msgstr "閉じているマウントを探す際にエラー: %s\n"
 
-#: ../programs/gvfs-mount.c:683
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "%s をマウントする際にエラー: %s\n"
 
-#: ../programs/gvfs-mount.c:697
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s を %s にマウントしました\n"
 
-#: ../programs/gvfs-mount.c:748
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "デバイスファイル %s にはボリュームがありません\n"
 
-#: ../programs/gvfs-mount.c:939
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- <場所> をマウント"
 
@@ -2793,8 +2729,6 @@ msgid "Error trashing file: %s\n"
 msgstr "ファイルを削除する際にエラー: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-#, fuzzy
-#| msgid "Follow symlinks, mounts and shortcuts like dirs"
 msgid "Follow symbolic links, mounts and shortcuts like directories"
 msgstr ""
 "ディレクトリのようにシンボリックリンクやマウントやショートカットをたどります"
@@ -2802,72 +2736,3 @@ msgstr ""
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "- ツリー状フォーマットでディレクトリの中身を一覧にする"
-
-#~ msgid "Unhandled Inst proxy error (%d)"
-#~ msgstr "処理できない Inst プロキシー・エラー (%d)"
-
-#~ msgid "Unhandled SBServices proxy error (%d)"
-#~ msgstr "処理できない SBServices プロキシー・エラー (%d)"
-
-#~ msgid "Service %d on Apple Mobile Device"
-#~ msgstr "Apple モバイルデバイスのサービス %d"
-
-#~ msgid "ftp on %s"
-#~ msgstr "ftp (%s)"
-
-#~ msgid "Error renaming dir"
-#~ msgstr "ディレクトリ名を変更する際にエラー"
-
-#~ msgid "sftp on %s"
-#~ msgstr "sftp (%s)"
-
-#~ msgid "%s (%s)"
-#~ msgstr "%s (%s)"
-
-#~ msgid "Enter password"
-#~ msgstr "パスワードを入力してください"
-
-#~ msgid "- output files at <location>"
-#~ msgstr "- <場所> にある出力ファイル"
-
-#~ msgid "Invalid return value from get_info"
-#~ msgstr "get_info() の返り値が間違っています"
-
-#~ msgid "Invalid return value from query_info"
-#~ msgstr "query_info() の返り値が間違っています"
-
-#~ msgid "Invalid return value from call"
-#~ msgstr "call() の返り値が間違っています"
-
-#~ msgid "Invalid return value from get_filesystem_info"
-#~ msgstr "get_filesystem_info() の返り値が間違っています"
-
-#~ msgid "Invalid return value from query_filesystem_info"
-#~ msgstr "query_filesystem_info() の返り値が間違っています"
-
-#~ msgid "Invalid return value from monitor_dir"
-#~ msgstr "monitor_dir() の返り値が間違っています"
-
-#~ msgid "Invalid return value from monitor_file"
-#~ msgstr "monitor_file() の返り値が間違っています"
-
-#~ msgid "The query info operation is not supported"
-#~ msgstr "query_info の操作はサポートしていません"
-
-#~ msgid "Query info not supported on stream"
-#~ msgstr "ストリーム上での query_info はサポートしていません"
-
-#~ msgid "Invalid return value from open_icon_for_read"
-#~ msgstr "open_icon_for_read() の返り値が間違っています"
-
-#~ msgid "broken transmission"
-#~ msgstr "送信エラー"
-
-#~ msgid "Could not connect to host"
-#~ msgstr "ホストに接続できませんでした"
-
-#~ msgid "filename too long"
-#~ msgstr "ファイル名が長すぎます"
-
-#~ msgid "Invalid destination filename"
-#~ msgstr "転送先のファイル名が間違っています"
diff --git a/po/mk.po b/po/mk.po
index 036f59fb..17f1d294 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -7,134 +7,170 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: mk\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-08-21 15:25+0000\n"
-"PO-Revision-Date: 2008-08-27 17:05+0200\n"
-"Last-Translator: Jovan Naumovski <jovan@lugola.net>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-24 14:36+0000\n"
+"PO-Revision-Date: 2012-01-02 12:50+0100\n"
+"Last-Translator: Jovan N\n"
 "Language-Team: en_US <kde-i18n-doc@lists.kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural= n==1 || n%10==1 ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
 "X-Generator: KAider 0.1\n"
 
-#: ../client/gdaemonfile.c:482 ../client/gdaemonfile.c:1979
+#: ../client/gdaemonfile.c:498
+#: ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
 msgstr "Операцијата не е поддржана, датотеки на различни монтирања"
 
-#: ../client/gdaemonfile.c:787
-msgid "Invalid return value from get_info"
-msgstr "Вратена е невалидна вредност од get_info"
-
-#: ../client/gdaemonfile.c:816 ../client/gdaemonfile.c:1563
-msgid "Invalid return value from query_info"
-msgstr "Вратена е невалидна вредност од query_info"
-
-#: ../client/gdaemonfile.c:894
+#. Translators: %s is the name of a programming function
+#: ../client/gdaemonfile.c:876
+#: ../client/gdaemonfile.c:911
+#: ../client/gdaemonfile.c:1027
+#: ../client/gdaemonfile.c:1106
+#: ../client/gdaemonfile.c:1169
+#: ../client/gdaemonfile.c:1232
+#: ../client/gdaemonfile.c:1298
+#: ../client/gdaemonfile.c:1361
+#: ../client/gdaemonfile.c:1378
+#: ../client/gdaemonfile.c:1867
+#: ../client/gdaemonfile.c:1897
+#: ../client/gdaemonfile.c:2058
+#: ../client/gdaemonfile.c:2560
+#: ../client/gdaemonfile.c:2609
+#: ../client/gdaemonfile.c:2674
+#: ../client/gdaemonfile.c:2759
+#: ../client/gdaemonfile.c:2835
+#: ../client/gdaemonfile.c:3024
+#: ../client/gdaemonfile.c:3105
+#: ../client/gvfsiconloadable.c:145
+#: ../client/gvfsiconloadable.c:374
+#, c-format
+#| msgid "Invalid return value from open"
+msgid "Invalid return value from %s"
+msgstr "Невалидна вредност за враќање %s"
+
+#: ../client/gdaemonfile.c:994
+#: ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Не можев да добијам датотека со опишувач на стрим"
 
-#: ../client/gdaemonfile.c:926 ../client/gdaemonfile.c:996
-#: ../client/gdaemonfile.c:1055 ../client/gdaemonfile.c:1114
-#: ../client/gdaemonfile.c:1176 ../client/gdaemonfile.c:2234
-#: ../client/gdaemonfile.c:2312 ../client/gdaemonfile.c:2571
-msgid "Invalid return value from open"
-msgstr "Вратена е невалидна вредност од open"
-
-#: ../client/gdaemonfile.c:1006 ../client/gdaemonfile.c:1065
-#: ../client/gdaemonfile.c:1124 ../client/gdaemonfile.c:1186
-#: ../client/gdaemonfile.c:2202
+#: ../client/gdaemonfile.c:1116
+#: ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242
+#: ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639
+#: ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Не добив датотека со опишувач за стрим"
 
-#: ../client/gdaemonfile.c:1238 ../client/gdaemonfile.c:1255
-msgid "Invalid return value from call"
-msgstr "Вратена е невалидна вредност од call"
-
-#: ../client/gdaemonfile.c:1534
-msgid "Invalid return value from get_filesystem_info"
-msgstr "Вратена е невалидна вредност од get_filesystem_info"
-
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1647
+#: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
 msgstr "Не можев да добијам соодветно монтирање"
 
-#: ../client/gdaemonfile.c:1677
+#: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Невалидно име на датотека %s"
 
-#: ../client/gdaemonfile.c:1719
-msgid "Invalid return value from query_filesystem_info"
-msgstr "Вратена е невалидна вредност од query_filesystem_info"
-
-#: ../client/gdaemonfile.c:2124
-msgid "Invalid return value from monitor_dir"
-msgstr "Вратена е невалидна вредност од monitor_dir"
-
-#: ../client/gdaemonfile.c:2173
-msgid "Invalid return value from monitor_file"
-msgstr "Вратена е невалидна вредност од monitor_file"
+#: ../client/gdaemonfile.c:2256
+#: ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333
+#: ../client/gdaemonvfs.c:1386
+#, c-format
+#| msgid "Error deleting file: %s"
+msgid "Error setting file metadata: %s"
+msgstr "Грешка при поставувањето на мета податоците за датотеката: %s"
+
+#: ../client/gdaemonfile.c:2257
+#: ../client/gdaemonvfs.c:1387
+msgid "values must be string or list of strings"
+msgstr "вредностите мора да се знаковна низа или листа од знаковни низи"
+
+#: ../client/gdaemonfileenumerator.c:466
+#: ../client/gdaemonfileenumerator.c:549
+#: ../client/gdaemonfileenumerator.c:600
+#: ../client/gdaemonfileinputstream.c:630
+#: ../client/gdaemonfileinputstream.c:783
+#: ../client/gdaemonfileinputstream.c:901
+#: ../client/gdaemonfileinputstream.c:1149
+#: ../client/gdaemonfileinputstream.c:1391
+#: ../client/gdaemonfileoutputstream.c:506
+#: ../client/gdaemonfileoutputstream.c:681
+#: ../client/gdaemonfileoutputstream.c:873
+#: ../client/gdaemonfileoutputstream.c:1052
+#: ../client/gvfsdaemondbus.c:1062
+#: ../daemon/gvfsbackendobexftp.c:1085
+#: ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225
+#: ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426
+#: ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735
+#: ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924
+#: ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005
+#: ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087
+#: ../daemon/gvfsbackendsmb.c:1179
+#: ../daemon/gvfsbackendtest.c:91
+#: ../daemon/gvfsbackendtest.c:124
+#: ../daemon/gvfsbackendtest.c:187
+#: ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202
+#: ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541
+#: ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777
+#: ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963
+#: ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488
+#: ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826
+#: ../monitor/proxy/gproxyvolume.c:903
+msgid "Operation was cancelled"
+msgstr "Операцијата беше прекината"
 
-#: ../client/gdaemonfileinputstream.c:450
-#: ../client/gdaemonfileinputstream.c:458
-#: ../client/gdaemonfileinputstream.c:1300
-#: ../client/gdaemonfileinputstream.c:1310
-#: ../client/gdaemonfileoutputstream.c:402
-#: ../client/gdaemonfileoutputstream.c:410
-#: ../client/gdaemonfileoutputstream.c:1054
-#: ../client/gdaemonfileoutputstream.c:1064
+#: ../client/gdaemonfileinputstream.c:527
+#: ../client/gdaemonfileinputstream.c:535
+#: ../client/gdaemonfileinputstream.c:1684
+#: ../client/gdaemonfileinputstream.c:1694
+#: ../client/gdaemonfileoutputstream.c:450
+#: ../client/gdaemonfileoutputstream.c:458
+#: ../client/gdaemonfileoutputstream.c:1236
+#: ../client/gdaemonfileoutputstream.c:1246
 #, c-format
 msgid "Error in stream protocol: %s"
 msgstr "Грешка во протоколот за стримување: %s"
 
-#: ../client/gdaemonfileinputstream.c:458
-#: ../client/gdaemonfileinputstream.c:1310
-#: ../client/gdaemonfileoutputstream.c:410
-#: ../client/gdaemonfileoutputstream.c:1064
+#: ../client/gdaemonfileinputstream.c:535
+#: ../client/gdaemonfileinputstream.c:1694
+#: ../client/gdaemonfileoutputstream.c:458
+#: ../client/gdaemonfileoutputstream.c:1246
 msgid "End of stream"
 msgstr "Крај на стрим"
 
-#: ../client/gdaemonfileinputstream.c:518
-#: ../client/gdaemonfileinputstream.c:674
-#: ../client/gdaemonfileinputstream.c:782
-#: ../client/gdaemonfileinputstream.c:1032
-#: ../client/gdaemonfileoutputstream.c:458
-#: ../client/gdaemonfileoutputstream.c:636
-#: ../client/gdaemonfileoutputstream.c:831 ../daemon/gvfsbackendobexftp.c:772
-#: ../daemon/gvfsbackendobexftp.c:793 ../daemon/gvfsbackendobexftp.c:912
-#: ../daemon/gvfsbackendobexftp.c:1049 ../daemon/gvfsbackendobexftp.c:1113
-#: ../daemon/gvfsbackendobexftp.c:1250 ../daemon/gvfsbackendobexftp.c:1277
-#: ../daemon/gvfsbackendobexftp.c:1336 ../daemon/gvfsbackendobexftp.c:1358
-#: ../daemon/gvfsbackendobexftp.c:1418 ../daemon/gvfsbackendobexftp.c:1437
-#: ../daemon/gvfsbackendsmb.c:1069 ../daemon/gvfsbackendtest.c:87
-#: ../daemon/gvfsbackendtest.c:120 ../daemon/gvfsbackendtest.c:183
-#: ../daemon/gvfschannel.c:298
-msgid "Operation was cancelled"
-msgstr "Операцијата беше прекината"
-
-#: ../client/gdaemonfileinputstream.c:1207
-#: ../client/gdaemonfileoutputstream.c:942
+#: ../client/gdaemonfileinputstream.c:1330
+#: ../client/gdaemonfileoutputstream.c:981
 msgid "Seek not supported on stream"
 msgstr "Барањето не е поддржано за стримот"
 
-#: ../client/gdaemonfileinputstream.c:1237
-msgid "The query info operation is not supported"
-msgstr "Операцијата за барање на информации не е поддржана"
-
-#: ../client/gdaemonfileoutputstream.c:991
-#, c-format
-msgid "Query info not supported on stream"
-msgstr "Барањето не е поддржано за стримот"
-
-#: ../client/gdaemonvfs.c:749
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Грешка при добивањето на податоци за монтирањето: %s"
 
-#: ../client/gvfsdaemondbus.c:568 ../client/gvfsdaemondbus.c:999
+#: ../client/gdaemonvfs.c:1199
+#| msgid "Cannot connect to the system bus"
+msgid "Can't contact session bus"
+msgstr "Не можам да се поврзам со магистралата на сесијата"
+
+#: ../client/gvfsdaemondbus.c:575
+#: ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Грешка при поврзувањето со демонот: %s"
@@ -149,89 +185,736 @@ msgstr "Грешка при креирањето на сокет: %s"
 msgid "Error connecting to socket: %s"
 msgstr "Грешка при поврзувањето со сокет: %s"
 
-#: ../common/gvfsdaemonprotocol.c:515
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
 msgstr "Невалиден формат за датотеки со информации"
 
-#: ../common/gvfsdaemonprotocol.c:532
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
 msgstr "Невалидна содржина за листа со атрибути на информации"
 
-#: ../daemon/daemon-main.c:63 ../daemon/daemon-main.c:206
+#: ../common/gvfsdnssdresolver.c:209
+#, c-format
+#| msgid "Error initializing camera"
+msgid "Error initializing Avahi: %s"
+msgstr "Грешка во иницијализирањето на Avahi: %s"
+
+#: ../common/gvfsdnssdresolver.c:255
+#, c-format
+#| msgid "Error creating socket: %s"
+msgid "Error creating Avahi resolver: %s"
+msgstr "Грешка при креирањето на Avahi разрешувач: %s"
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#.
+#: ../common/gvfsdnssdresolver.c:1100
+#, c-format
+msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\""
+msgstr "Грешка при разрешувањето на сервисот од тип „%s“ со име „%s“  на доменот „%s“ "
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#. * - the fourth %s refers to the required TXT keys
+#.
+#: ../common/gvfsdnssdresolver.c:1126
+#, c-format
+msgid "Error resolving \"%s\" service \"%s\" on domain \"%s\". One or more TXT records are missing. Keys required: \"%s\"."
+msgstr "Грешка при разрешувањето на сервисот од тип „%s“ со име „%s“  на доменот „%s“. Еден или повеќе TXT записи недостасуваат. Потребни клучеви: „%s“ ."
+
+#. Translators:
+#. * - the first %s refers to the service type
+#. * - the second %s refers to the service name
+#. * - the third %s refers to the domain
+#.
+#: ../common/gvfsdnssdresolver.c:1143
+#, c-format
+msgid "Timed out resolving \"%s\" service \"%s\" on domain \"%s\""
+msgstr "Истече времето за разрешување на сервисот од тип „%s“ со име „%s“  на доменот „%s“ "
+
+#: ../common/gvfsdnssdutils.c:233
+#: ../common/gvfsdnssdutils.c:263
+#: ../common/gvfsdnssdutils.c:280
+#, c-format
+msgid "Malformed dns-sd encoded_triple '%s'"
+msgstr "Неправилен dns-sd encoded_triple „%s“"
+
+#: ../common/gvfsicon.c:250
+#, c-format
+msgid "Can't handle version %d of GVfsIcon encoding"
+msgstr "Не можам да се справам со верзијата %d на енкодирањето за GVfsIcon"
+
+#: ../common/gvfsicon.c:260
+msgid "Malformed input data for GVfsIcon"
+msgstr "Неправилни влезни податоци за GVfsIcon"
+
+#: ../daemon/daemon-main.c:81
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Грешка при поврзувањето со D-Bus: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:78
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "Сервис за датотечен систем на %s"
 
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:115
+#: ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Грешка: %s"
 
-#: ../daemon/daemon-main.c:131
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Употреба: %s --spawner dbus-id object_path"
 
-#: ../daemon/daemon-main.c:155 ../daemon/daemon-main.c:173
+#: ../daemon/daemon-main.c:185
+#: ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Употреба: %s key=value key=value ..."
 
-#: ../daemon/daemon-main.c:171
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Не е одредена точка на монтирање"
 
-#: ../daemon/daemon-main.c:241
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "Точката за монтирање на %s веќе се извршува"
 
-#: ../daemon/daemon-main.c:252
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 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:315 ../daemon/gvfsbackendftp.c:963
-#: ../daemon/gvfsbackendsftp.c:1894
+#: ../daemon/gvfsafpconnection.c:1305
+#: ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "Добив EOS"
+
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "Серверот не поддржува лозинки подолги од 256 знаци"
+
+#: ../daemon/gvfsafpserver.c:155
+#: ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "Беше добиено невалидно корисничко име"
+
+#: ../daemon/gvfsafpserver.c:334
+#: ../daemon/gvfsafpserver.c:563
 #, c-format
-msgid "/ on %s"
-msgstr "/ на %s"
+msgid "AFP server %s declined the submitted password"
+msgstr "AFP серверот %s ја одби испратената лозинка"
 
-#: ../daemon/gvfsbackendarchive.c:515 ../daemon/gvfsbackendftp.c:1479
-#: ../daemon/gvfsbackendsftp.c:1553
-msgid "No hostname specified"
-msgstr "Не е одредено име на хост"
+#: ../daemon/gvfsafpserver.c:365
+#: ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "Најавата на AFP серверот %s не успеа"
+
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "Серверот не поддржува лозинки подолги од 64 знаци"
 
-#: ../daemon/gvfsbackendarchive.c:526 ../daemon/gvfsbackendarchive.c:555
-#: ../daemon/gvfsbackenddav.c:1449 ../daemon/gvfsbackendhttp.c:299
-#: ../daemon/gvfsbackendobexftp.c:603 ../daemon/gvfsbackendobexftp.c:614
-#: ../daemon/gvfsbackendsmb.c:605
+#: ../daemon/gvfsafpserver.c:610
+#: ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "AFP серверот %s не поддржува анонимна најава"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr "Анонимната најава на AFP серверот %s не успеа, добив код на грешка: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
+msgid "Login to AFP server %s failed (no suitable authentication mechanism found)"
+msgstr "Најавата на AFP серверот %s не успеа (не беше пронајден соодветен механизам за аветнтикација)"
+
+#: ../daemon/gvfsafpserver.c:740
+#, c-format
+#| msgid "Failed to get folder list"
+msgid "Failed to connect to server (%s)"
+msgstr "Не успеав да се поврзам со сервер (%s)"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for afp as %s on %s"
+msgstr "Внесете лозинка за afp како %s на %s"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for afp on %s"
+msgstr "Внесете лозинка за afp на %s"
+
+#: ../daemon/gvfsafpserver.c:865
+#: ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985
+#: ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "Дијалог прозорецот за лозинка беше откажан"
+
+#: ../daemon/gvfsbackendafc.c:209
+msgid "Internal Apple File Control error"
+msgstr "Внатрешна грешка со контролата на датотеки на Apple"
+
+#: ../daemon/gvfsbackendafc.c:213
+#: ../daemon/gvfsbackendftp.c:736
+#| msgid "File doesn't exist"
+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 "Добиени се невалидни податоци од контролата на датотеки на Apple"
+
+#: ../daemon/gvfsbackendafc.c:233
+#, c-format
+msgid "Unhandled Apple File Control error (%d)"
+msgstr "Грешка во контролата на датотекаи на Apple која не е справена (%d)"
+
+#: ../daemon/gvfsbackendafc.c:249
+msgid "Listing applications installed on device failed"
+msgstr "Листањето на инсталирани апликации на уредот не успеа"
+
+#: ../daemon/gvfsbackendafc.c:265
+msgid "Accessing application icons on device failed"
+msgstr "Пристапувањето на икони за апликацијата на уредот не успеа"
+
+#: ../daemon/gvfsbackendafc.c:282
+msgid "Lockdown Error: Invalid Argument"
+msgstr "Грешка во заклучувањето: невалиден аргумент"
+
+#: ../daemon/gvfsbackendafc.c:286
+#: ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049
+#: ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448
+#: ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704
+#: ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346
+#: ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965
+#: ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089
+#: ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:1834
+#: ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "Пристапот е одбиен"
+
+#: ../daemon/gvfsbackendafc.c:290
+#, c-format
+msgid "Unhandled Lockdown error (%d)"
+msgstr "Грешка во заклучувањето која не е справена (%d)"
+
+#: ../daemon/gvfsbackendafc.c:307
+msgid "libimobiledevice Error: Invalid Argument"
+msgstr "Грепка во libimobiledevice: невалиден аргумент"
+
+#: ../daemon/gvfsbackendafc.c:311
+msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly."
+msgstr "Грешка во libimobiledevice: не е пронајден уред. Проверете дали usbmuxd е правилно инсталиран."
+
+#: ../daemon/gvfsbackendafc.c:315
+#, c-format
+msgid "Unhandled libimobiledevice error (%d)"
+msgstr "Грешка во libimobiledevice која не е справена (%d)"
+
+#: ../daemon/gvfsbackendafc.c:382
+msgid "Try again"
+msgstr "Пробај пак"
+
+#: ../daemon/gvfsbackendafc.c:382
+#: ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024
+#: ../monitor/gdu/ggdumount.c:926
+#| msgid "Cancel Login"
+msgid "Cancel"
+msgstr "Откажи"
+
+#: ../daemon/gvfsbackendafc.c:400
+#: ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579
+#: ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:309
+#: ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878
+#: ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Невалидни спецификации за монтирање"
 
-#: ../daemon/gvfsbackendarchive.c:636 ../daemon/gvfsbackendarchive.c:686
-#: ../daemon/gvfsbackendarchive.c:715 ../daemon/gvfsbackendcdda.c:822
-#: ../daemon/gvfsbackendcomputer.c:572 ../daemon/gvfsbackenddnssd.c:345
-#: ../daemon/gvfsbackendftp.c:2101 ../daemon/gvfsbackendnetwork.c:590
-#: ../daemon/gvfsbackendsmbbrowse.c:804 ../daemon/gvfsbackendsmbbrowse.c:871
-#: ../daemon/gvfsbackendsmbbrowse.c:1042 ../daemon/gvfsbackendsmbbrowse.c:1116
+#: ../daemon/gvfsbackendafc.c:406
+#: ../daemon/gvfsbackendafc.c:436
+msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
+msgstr "Невалидна AFC локација: мора да биде во форма afc://uuid:port-number"
+
+#: ../daemon/gvfsbackendafc.c:422
+#, c-format
+msgid "Apple Mobile Device"
+msgstr "Apple мобилен уред"
+
+#: ../daemon/gvfsbackendafc.c:427
+#, c-format
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Apple мобилен уред, отклучен"
+
+#: ../daemon/gvfsbackendafc.c:432
+#, c-format
+msgid "Documents on Apple Mobile Device"
+msgstr "Документи на Apple мобилен уред"
+
+#: ../daemon/gvfsbackendafc.c:490
+#, c-format
+msgid "%s (jailbreak)"
+msgstr "%s (отклучен)"
+
+#. translators:
+#. * This is "Documents on foo" where foo is the device name, eg.:
+#. * Documents on Alan Smithee's iPhone
+#: ../daemon/gvfsbackendafc.c:497
+#: ../monitor/afc/afcvolume.c:125
+#, 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:579
+#, c-format
+msgid "The device '%s' is locked. Enter the passcode on the device and click 'Try again'."
+msgstr "Уредот „%s“ е отклучен. Внесете го кодот на уредот и притиснете „Пробај пак“."
+
+#: ../daemon/gvfsbackendafc.c:918
+#: ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645
+#: ../daemon/gvfsbackendgphoto2.c:1808
+#: ../daemon/gvfsbackendobexftp.c:1071
+#: ../daemon/gvfsbackendsmb.c:718
+#: ../daemon/gvfsbackendtrash.c:232
+msgid "Can't open directory"
+msgstr "Не можам да го отворам директориумот"
+
+#: ../daemon/gvfsbackendafc.c:928
+#: ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390
+#: ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467
+#: ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869
+#: ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695
+#: ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776
+#: ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627
+#: ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067
+#: ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendsmbbrowse.c:1094
+#: ../daemon/gvfsbackendsmbbrowse.c:1161
+#: ../daemon/gvfsbackendsmbbrowse.c:1333
+#: ../daemon/gvfsbackendsmbbrowse.c:1403
 #, c-format
 msgid "File doesn't exist"
 msgstr "Датотеката не постои"
 
-#: ../daemon/gvfsbackendarchive.c:724 ../daemon/gvfsbackendburn.c:680
-#: ../daemon/gvfsbackendcomputer.c:651 ../daemon/gvfsbackenddnssd.c:393
-#: ../daemon/gvfsbackendftp.c:912 ../daemon/gvfsbackendnetwork.c:637
+#: ../daemon/gvfsbackendafc.c:1119
+#: ../daemon/gvfsbackendafc.c:2462
+#| msgid "backups not supported yet"
+msgid "Backups are not yet supported."
+msgstr "Правењето на резерви се уште не е поддржано."
+
+#: ../daemon/gvfsbackendafc.c:1291
+#| msgid "Invalid backend type"
+msgid "Invalid seek type"
+msgstr "Невалиден тип на барање"
+
+#: ../daemon/gvfsbackendafc.c:2299
+#: ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087
+#: ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156
+#: ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633
+#: ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:391
+msgid "Operation unsupported"
+msgstr "Операцијата не е поддржана"
+
+#: ../daemon/gvfsbackendafpbrowse.c:121
+#: ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600
+#: ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784
+#: ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073
+#: ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323
+#: ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605
+#: ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234
+#: ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509
+#: ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877
+#: ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551
+#: ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "Добив код со грешка: %d од серверот"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285
+#: ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "Оваа датотека не може да се монтира"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+#| msgid "ftp as %s on %s"
+msgid "AFP shares for %s on %s"
+msgstr "AFP споделување за %s на %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+#| msgid "Windows shares on %s"
+msgid "AFP shares on %s"
+msgstr "AFP споделување на %s"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534
+#: ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539
+#: ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "Не е одредено име на хост"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602
+#: ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Протокол за сервисот на датотеки на Apple"
+
+#: ../daemon/gvfsbackendafp.c:471
+#: ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873
+#: ../daemon/gvfsbackendafp.c:3276
+#| msgid "File is directory"
+msgid "File is a directory"
+msgstr "Датотеката е директориум"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "Премногу отворени датотеки"
+
+#: ../daemon/gvfsbackendafp.c:1053
+#: ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350
+#: ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "Нема доволно празно место на просторот"
+
+#: ../daemon/gvfsbackendafp.c:1057
+#: ../daemon/gvfsbackendafp.c:1207
+#| msgid "Target file exists"
+msgid "Target file is open"
+msgstr "Целната датотека е отворена"
+
+#: ../daemon/gvfsbackendafp.c:1061
+#: ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593
+#: ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116
+#: ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510
+#: ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752
+#: ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372
+#: ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285
+#: ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "Целната датотека веќе постои"
+
+#: ../daemon/gvfsbackendafp.c:1065
+#: ../daemon/gvfsbackendafp.c:2358
+#| msgid "File doesn't exist"
+msgid "Ancestor directory doesn't exist"
+msgstr "Предокот директориум не постои"
+
+#: ../daemon/gvfsbackendafp.c:1069
+#: ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712
+#: ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "Просторот е само за читање"
+
+#: ../daemon/gvfsbackendafp.c:1211
+#: ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550
+#: ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "Директориумот не е празен"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "Целниот објект е означен како DeleteInhibit"
+
+#: ../daemon/gvfsbackendafp.c:1219
+#: ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+#| msgid "File doesn't exist"
+msgid "Target object doesn't exist"
+msgstr "Целниот објект не постои"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "ID-то не е пронајдено"
+
+#: ../daemon/gvfsbackendafp.c:1452
+#| msgid "Can't move directory over directory"
+msgid "Can't move directory into one of it's descendants"
+msgstr "Не можам да преместам директориумот во некој од претците директориуми"
+
+#: ../daemon/gvfsbackendafp.c:1456
+#| msgid "Can't move directory over directory"
+msgid "Can't move sharepoint into a shared directory"
+msgstr "Не можам да преместам споделена точка во споделен директориум"
+
+#: ../daemon/gvfsbackendafp.c:1460
+#| msgid "Can't move directory over directory"
+msgid "Can't move a shared directory into the Trash"
+msgstr "Не можам да преместам споделена точка во ѓубрето"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "Објектот кој се преместува е означен како RenameInhibit"
+
+#: ../daemon/gvfsbackendafp.c:1472
+#| msgid "File doesn't exist"
+msgid "Object being moved doesn't exist"
+msgstr "Објектот кој се преместува не постои"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "Серверот не ја поддржува операцијата FPCopyFile"
+
+#: ../daemon/gvfsbackendafp.c:1585
+#| msgid "Couldn't get stream file descriptor"
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "Не можам да ја отворам изворната датотека како Read/DenyWrite"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "Изворната датотека и/или дестинацискиот директориум не постои"
+
+#: ../daemon/gvfsbackendafp.c:1601
+#| msgid "The file is not a directory"
+msgid "Source file is a directory"
+msgstr "Изворната датотека не е директориум"
+
+#: ../daemon/gvfsbackendafp.c:1909
+#: ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544
+#: ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "Не можам да го копирам директориумот над директориум"
+
+#: ../daemon/gvfsbackendafp.c:1912
+#: ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201
+#: ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333
+#: ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408
+#: ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "Датотеката е директориум"
+
+#: ../daemon/gvfsbackendafp.c:1928
+#: ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567
+#: ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "Не можам да го ископирам директориумот рекурзивно"
+
+#: ../daemon/gvfsbackendafp.c:2106
+#: ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "Не можам да го преместам директориумот над друг директориум"
+
+#: ../daemon/gvfsbackendafp.c:2214
+#: ../daemon/gvfsbackendafp.c:2308
+#| msgid "Can't eject file"
+msgid "Can't rename volume"
+msgstr "Не можам да го преименувам просторот"
+
+#: ../daemon/gvfsbackendafp.c:2218
+#| msgid "Name already exists"
+msgid "Object with that name already exists"
+msgstr "Веќе постои објект со тоа име"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "Целниот објект е означен како RenameInhibit"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "Просторот е рамен и не поддржува директориуми"
+
+#: ../daemon/gvfsbackendafp.c:2362
+#| msgid "Target file already exists"
+msgid "Target directory already exists"
+msgstr "Целната датотека веќе постои"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "Датотеката не е отворена за запишување"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "Датотеката не е отворена за читање"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "Постои конфликт во опсегот на заклучување"
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+#| msgid "Unable to create temporary file"
+msgid "Couldn't create temporary file (%s)"
+msgstr "Не успеав да ја создадам привремената датотека (%s)"
+
+#: ../daemon/gvfsbackendafp.c:3283
+#: ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421
+#: ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "Датотеката беше изменета од надвор"
+
+#: ../daemon/gvfsbackendafp.c:3314
+#: ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335
+#: ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "правењето на резерви се уште не е поддржано"
+
+#: ../daemon/gvfsbackendafp.c:3539
+#| msgid "File doesn't exist"
+msgid "Directory doesn't exist"
+msgstr "Директориумот не постои"
+
+#: ../daemon/gvfsbackendafp.c:3543
+#| msgid "The file is not a directory"
+msgid "Target object is not a directory"
+msgstr "Целниот објект не е директориум"
+
+#: ../daemon/gvfsbackendafp.c:3795
+#: ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+#| msgid "Invalid attribute info list content"
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "Невалиден тип на атрибут (се очекуваше uint32)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+#| msgid "Not supported"
+msgid "Command not supported"
+msgstr "Командата не е поддржана"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "Лозинката на корисникот истече"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "Лозинката на корисникот мора да биде променета"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FPGetUserInfo не успеа (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+msgid "AFP volume %s for %s on %s"
+msgstr "AFP простор %s за %s на %s"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+msgid "AFP volume %s on %s"
+msgstr "AFP простор %s на %s"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "Не можев да го монтирам AFP просторот %s на %s"
+
+#: ../daemon/gvfsbackendafp.c:4303
+#| msgid "No drive specified"
+msgid "No volume specified"
+msgstr "Не е одреден простор"
+
+#. FIXME: this should really be "/ in %s", but can't change
+#. due to string freeze.
+#. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>"
+#: ../daemon/gvfsbackendarchive.c:330
+#: ../daemon/gvfsbackendsftp.c:2269
+#: ../daemon/gvfsftpdircache.c:431
+#, c-format
+msgid "/ on %s"
+msgstr "/ на %s"
+
+#: ../daemon/gvfsbackendarchive.c:785
+#: ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendcomputer.c:714
+#: ../daemon/gvfsbackenddnssd.c:445
+#: ../daemon/gvfsbackendftp.c:351
+#: ../daemon/gvfsbackendnetwork.c:649
+#: ../daemon/gvfsbackendsftp.c:3881
+#: ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "Датотеката не е директориум"
 
@@ -244,20 +927,31 @@ msgstr "Сними"
 msgid "Unable to create temporary directory"
 msgstr "Не можам да креирам привремен директориум"
 
-#: ../daemon/gvfsbackendburn.c:405 ../daemon/gvfsbackendburn.c:416
-#: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
-#: ../daemon/gvfsbackendburn.c:719 ../daemon/gvfsbackendburn.c:745
-#: ../daemon/gvfsbackendburn.c:783 ../daemon/gvfsbackendgphoto2.c:1098
-#: ../daemon/gvfsbackendgphoto2.c:1981 ../daemon/gvfsbackendgphoto2.c:2690
+#: ../daemon/gvfsbackendburn.c:405
+#: ../daemon/gvfsbackendburn.c:416
+#: ../daemon/gvfsbackendburn.c:451
+#: ../daemon/gvfsbackendburn.c:672
+#: ../daemon/gvfsbackendburn.c:717
+#: ../daemon/gvfsbackendburn.c:743
+#: ../daemon/gvfsbackendburn.c:781
+#: ../daemon/gvfsbackendburn.c:972
+#: ../daemon/gvfsbackendburn.c:1008
+#: ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1203
+#: ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848
+#: ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendsftp.c:2949
+#: ../daemon/gvfsbackendsftp.c:2962
+#: ../daemon/gvfsbackendsftp.c:2982
+#: ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "Нема таква датотека или директориум"
 
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2036
-msgid "Directory not empty"
-msgstr "Директориумот не е празен"
-
-#: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:897
+#: ../daemon/gvfsbackendburn.c:459
+#: ../daemon/gvfsbackendburn.c:904
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "Не можам да ја копирам датотеката над директориумот"
 
@@ -266,817 +960,1018 @@ msgstr "Не можам да ја копирам датотеката над д�
 msgid "CD/DVD Creator"
 msgstr "Креатор на CD/DVD"
 
-#: ../daemon/gvfsbackendburn.c:755 ../daemon/gvfsbackendburn.c:791
-#: ../daemon/gvfsbackendburn.c:917 ../daemon/gvfsbackendgphoto2.c:2763
+#: ../daemon/gvfsbackendburn.c:753
+#: ../daemon/gvfsbackendburn.c:789
+#: ../daemon/gvfsbackendburn.c:924
+#: ../daemon/gvfsbackendburn.c:986
+#: ../daemon/gvfsbackendburn.c:990
+#: ../daemon/gvfsbackendburn.c:1000
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "Датотеката постои"
 
-#: ../daemon/gvfsbackendburn.c:845
+#: ../daemon/gvfsbackendburn.c:828
+#: ../daemon/gvfsjobcloseread.c:112
+#: ../daemon/gvfsjobclosewrite.c:120
+#: ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141
+#: ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175
+#: ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123
+#: ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123
+#: ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157
+#: ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134
+#: ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166
+#: ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117
+#: ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176
+#: ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136
+#: ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150
+#: ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119
+#: ../daemon/gvfsjobread.c:120
+#: ../daemon/gvfsjobseekread.c:119
+#: ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobsetattribute.c:151
+#: ../daemon/gvfsjobsetdisplayname.c:128
+#: ../daemon/gvfsjobstartmountable.c:133
+#: ../daemon/gvfsjobstopmountable.c:136
+#: ../daemon/gvfsjobtrash.c:123
+#: ../daemon/gvfsjobunmountmountable.c:140
+#: ../daemon/gvfsjobunmountmountable.c:155
+#: ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1177
+#: ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
+msgid "Operation not supported by backend"
+msgstr "Операцијата не е поддржана од бекендот"
+
+#: ../daemon/gvfsbackendburn.c:853
 msgid "No such file or directory in target path"
 msgstr "Нема таква датотека или директориум во целната патека"
 
-#: ../daemon/gvfsbackendburn.c:868
-msgid "Can't copy directory over directory"
-msgstr "Не можам да го копирам директориумот над директориум"
-
-#: ../daemon/gvfsbackendburn.c:877
+#: ../daemon/gvfsbackendburn.c:885
+#: ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818
+#: ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "Целната датотека постои"
 
-#: ../daemon/gvfsbackendburn.c:884
-msgid "Can't recursively copy directory"
-msgstr "Не можам да го ископирам директориумот рекурзивно"
-
-#: ../daemon/gvfsbackendburn.c:943 ../daemon/gvfsbackendgphoto2.c:2348
-#: ../daemon/gvfsbackendgphoto2.c:2556 ../daemon/gvfsbackendgphoto2.c:2651
-#: ../daemon/gvfsbackendgphoto2.c:2742
+#: ../daemon/gvfsbackendburn.c:950
+#: ../daemon/gvfsbackendcomputer.c:794
+#: ../daemon/gvfsbackendgphoto2.c:2502
+#: ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808
+#: ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Не е поддржано"
 
-#: ../daemon/gvfsbackendcdda.c:223 ../daemon/gvfsbackendgphoto2.c:1402
+#: ../daemon/gvfsbackend.c:962
+#: ../monitor/gdu/ggdumount.c:925
+#| msgid "Log In Anyway"
+msgid "Unmount Anyway"
+msgstr "Одмонтирај секако"
+
+#: ../daemon/gvfsbackend.c:965
+#: ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"Просторот е зафатен\n"
+"Една или повеќе апликации го чуваат просторот зафатен."
+
+#: ../daemon/gvfsbackendcdda.c:332
+#: ../daemon/gvfsbackendgphoto2.c:1506
+#| msgid "Cannot create gphoto2 context"
+msgid "Cannot create gudev client"
+msgstr "Не можам да креирам gudev клиент"
+
+#: ../daemon/gvfsbackendcdda.c:352
+#: ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Не можам да се поврзам со системската магистрала"
 
-#: ../daemon/gvfsbackendcdda.c:233 ../daemon/gvfsbackendgphoto2.c:1414
+#: ../daemon/gvfsbackendcdda.c:363
+#: ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Не можам да креирам содржина за libhal"
 
-#: ../daemon/gvfsbackendcdda.c:246 ../daemon/gvfsbackendgphoto2.c:1427
+#: ../daemon/gvfsbackendcdda.c:377
+#: ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Не можам да го иницијализирам libhal"
 
-#: ../daemon/gvfsbackendcdda.c:261 ../daemon/gvfsbackendcdda.c:332
+#: ../daemon/gvfsbackendcdda.c:393
+#: ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "Не е одреден уред"
 
-#: ../daemon/gvfsbackendcdda.c:276
+#: ../daemon/gvfsbackendcdda.c:417
 #, c-format
 msgid "Cannot find drive %s"
 msgstr "Не можам да го пронајдам уредот %s"
 
-#: ../daemon/gvfsbackendcdda.c:286
+#: ../daemon/gvfsbackendcdda.c:430
 #, c-format
 msgid "Drive %s does not contain audio files"
 msgstr "Уредот %s не содржи аудио датотеки"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:294
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
 msgstr "cdda точка за монтирање на %s"
 
-#: ../daemon/gvfsbackendcdda.c:295 ../daemon/gvfsbackendcdda.c:799
-#: ../monitor/hal/ghalmount.c:435 ../monitor/hal/ghalvolume.c:214
-#: ../monitor/hal/ghalvolume.c:235
+#: ../daemon/gvfsbackendcdda.c:441
+#: ../daemon/gvfsbackendcdda.c:961
+#: ../monitor/gdu/ggduvolume.c:349
+#: ../monitor/hal/ghalmount.c:325
+#: ../monitor/hal/ghalvolume.c:225
+#: ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "Аудио диск"
 
-#: ../daemon/gvfsbackendcdda.c:356 ../daemon/gvfsbackendgphoto2.c:1655
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "Датотечниот систем е зафатен: %d отворена датотека"
 msgstr[1] "Датотечниот систем е зафатен: %d отворени датотеки"
-msgstr[2] "Датотечниот систем е зафатен: %d отворени датотеки"
 
-#: ../daemon/gvfsbackendcdda.c:546
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "Ја нема датотеката %s на уредот %s"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:655
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "Грешка од „paranoia“ на уредот %s"
 
-#: ../daemon/gvfsbackendcdda.c:718
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "Грешка во барањето во стримот на датотеката %s"
 
-#: ../daemon/gvfsbackendcdda.c:815 ../daemon/gvfsbackendgphoto2.c:1711
+#: ../daemon/gvfsbackendcdda.c:980
+#: ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Нема таква датотека"
 
-#: ../daemon/gvfsbackendcdda.c:829
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "Датотеката не постои или не е аудио трака"
 
-#: ../daemon/gvfsbackendcdda.c:935
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "Сервис за датотечен систем на аудио CD"
 
-#: ../daemon/gvfsbackendcomputer.c:179 ../daemon/gvfsbackendcomputer.c:693
+#: ../daemon/gvfsbackendcomputer.c:192
+#: ../daemon/gvfsbackendcomputer.c:756
 msgid "Computer"
 msgstr "Компјутер"
 
-#: ../daemon/gvfsbackendcomputer.c:466
-msgid "Filesystem"
+#: ../daemon/gvfsbackendcomputer.c:521
+#| msgid "Filesystem"
+msgid "File System"
 msgstr "Датотечен систем"
 
-#: ../daemon/gvfsbackendcomputer.c:590 ../daemon/gvfsbackendgphoto2.c:1703
-#: ../daemon/gvfsbackendobexftp.c:758 ../daemon/gvfsbackendsmb.c:648
-#: ../daemon/gvfsbackendtrash.c:678
-msgid "Can't open directory"
-msgstr "Не можам да го отворам директориумот"
-
-#: ../daemon/gvfsbackendcomputer.c:594 ../daemon/gvfsbackendcomputer.c:732
+#: ../daemon/gvfsbackendcomputer.c:649
 msgid "Can't open mountable file"
 msgstr "Не можам да отворам монтирачка датотека"
 
-#: ../daemon/gvfsbackendcomputer.c:780 ../daemon/gvfsbackendsftp.c:1037
+#: ../daemon/gvfsbackendcomputer.c:840
+#: ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "Внатрешна грешка: %s"
 
-#: ../daemon/gvfsbackendcomputer.c:812 ../daemon/gvfsbackendcomputer.c:929
+#: ../daemon/gvfsbackendcomputer.c:872
+#: ../daemon/gvfsbackendcomputer.c:991
 msgid "Can't mount file"
 msgstr "Не можам да ја монтирам датотеката"
 
-#: ../daemon/gvfsbackendcomputer.c:824
-msgid "No media in the drive"
+#: ../daemon/gvfsbackendcomputer.c:884
+#| msgid "No media in the drive"
+msgid "No medium in the drive"
 msgstr "Нема медиум во уредот"
 
-#: ../daemon/gvfsbackendcomputer.c:881 ../daemon/gvfsbackendcomputer.c:972
-#: ../daemon/gvfsbackendcomputer.c:1072
+#: ../daemon/gvfsbackendcomputer.c:941
+#: ../daemon/gvfsbackendcomputer.c:1036
+#: ../daemon/gvfsbackendcomputer.c:1142
+#: ../daemon/gvfsbackendcomputer.c:1232
+#: ../daemon/gvfsbackendcomputer.c:1305
+#: ../daemon/gvfsbackendcomputer.c:1374
 msgid "Not a mountable file"
 msgstr "Не е монтирачка датотека"
 
-#: ../daemon/gvfsbackendcomputer.c:987
+#: ../daemon/gvfsbackendcomputer.c:1055
 msgid "Can't unmount file"
 msgstr "Не можам да ја одмонтирам датотеката"
 
-#: ../daemon/gvfsbackendcomputer.c:1103
+#: ../daemon/gvfsbackendcomputer.c:1185
 msgid "Can't eject file"
 msgstr "Не можам да ја извадам датотеката"
 
-#: ../daemon/gvfsbackenddav.c:503 ../daemon/gvfsbackenddav.c:1516
-#: ../daemon/gvfsbackendhttp.c:245
+#: ../daemon/gvfsbackendcomputer.c:1252
+#: ../daemon/gvfsbackendcomputer.c:1259
+#| msgid "Can't mount file"
+msgid "Can't start file"
+msgstr "Не можам да ја стартувам датотеката"
+
+#: ../daemon/gvfsbackendcomputer.c:1325
+#: ../daemon/gvfsbackendcomputer.c:1332
+#| msgid "Can't mount file"
+msgid "Can't stop file"
+msgstr "Не можам да ја стопирам датотеката"
+
+#: ../daemon/gvfsbackendcomputer.c:1389
+#: ../daemon/gvfsbackendcomputer.c:1396
+#| msgid "Can't mount file"
+msgid "Can't poll file"
+msgstr "Не можам да ја испитам датотеката"
+
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+#| msgid "WebDAV on %s"
+msgid "WebDAV as %s on %s%s"
+msgstr "WebDAV како %s на %s%s"
+
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV on <hostname>:<port>"; The ":port" part is again the second
+#. %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 "WebDAV на %s%s"
+
+#: ../daemon/gvfsbackenddav.c:668
+#: ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP грешка: %s"
 
-#: ../daemon/gvfsbackenddav.c:520
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Не можев да го парсирам одговорот"
 
-#: ../daemon/gvfsbackenddav.c:529
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Празен одговор"
 
-#: ../daemon/gvfsbackenddav.c:537
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "Неочекуван одговор од серверот"
 
-#: ../daemon/gvfsbackenddav.c:1149 ../daemon/gvfsbackenddav.c:1651
+#: ../daemon/gvfsbackenddav.c:1373
+#: ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086
+#: ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Невалиден одговор"
 
-#: ../daemon/gvfsbackenddav.c:1292
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "WebDAV споделување"
 
-#: ../daemon/gvfsbackenddav.c:1294
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "Внесете лозинка за %s"
 
-#: ../daemon/gvfsbackenddav.c:1297
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
 msgstr "Ве молам, внесете лозинка за проксито"
 
-#: ../daemon/gvfsbackenddav.c:1520 ../daemon/gvfsbackenddav.c:1524
+#: ../daemon/gvfsbackenddav.c:1868
+#: ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "Не е споделување овозможено со WebDAV"
 
-#: ../daemon/gvfsbackenddav.c:1547
-#, c-format
-msgid "WebDAV on %s"
-msgstr "WebDAV на %s"
-
-#: ../daemon/gvfsbackenddav.c:1607 ../daemon/gvfsbackenddav.c:1680
+#: ../daemon/gvfsbackenddav.c:1953
+#: ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114
+#: ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "Не можев да креирам барање"
 
-#: ../daemon/gvfsbackenddav.c:1743 ../daemon/gvfsbackenddav.c:1996
-#: ../daemon/gvfsbackenddav.c:2107 ../daemon/gvfsbackendftp.c:1699
-#: ../daemon/gvfsbackendftp.c:2365 ../daemon/gvfsbackendsftp.c:3559
-#: ../daemon/gvfsbackendsmb.c:1804
-msgid "Target file already exists"
-msgstr "Целната датотека веќе постои"
-
-#: ../daemon/gvfsbackenddav.c:1816 ../daemon/gvfsbackendsftp.c:2807
-#: ../daemon/gvfsbackendsmb.c:1038
-msgid "The file was externally modified"
-msgstr "Датотеката беше изменета од надвор"
-
-#: ../daemon/gvfsbackenddav.c:1847 ../daemon/gvfsbackendsmb.c:1074
-#: ../daemon/gvfsbackendsmb.c:1821
+#: ../daemon/gvfsbackenddav.c:2361
+#: ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Креирањето на бекап датотека не успеа"
 
-#. TODO: Name
-#: ../daemon/gvfsbackenddnssd.c:433
-msgid "dns-sd"
-msgstr "dns-sd"
+#. "separate": a link to dns-sd://local/
+#: ../daemon/gvfsbackenddnssd.c:492
+#: ../daemon/gvfsbackendnetwork.c:371
+msgid "Local Network"
+msgstr "Локална мрежа"
 
-#: ../daemon/gvfsbackenddnssd.c:669 ../daemon/gvfsbackendnetwork.c:731
+#: ../daemon/gvfsbackenddnssd.c:736
+#: ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "Не можам да ја надгледувам датотеката или директориумот."
 
 #. TODO: Names, etc
-#: ../daemon/gvfsbackenddnssd.c:687
+#: ../daemon/gvfsbackenddnssd.c:754
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:688 ../daemon/gvfsbackendnetwork.c:676
-#: ../daemon/gvfsbackendnetwork.c:814 ../daemon/gvfsbackendnetwork.c:815
+#: ../daemon/gvfsbackenddnssd.c:755
+#: ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackendnetwork.c:820
+#: ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "Мрежа"
 
-#: ../daemon/gvfsbackendftp.c:236
-msgid "Accounts are unsupported"
-msgstr "Сметки не се поддржани"
-
-#: ../daemon/gvfsbackendftp.c:240
-msgid "Host closed connection"
-msgstr "Хостот ја затвори врската"
-
-#: ../daemon/gvfsbackendftp.c:244
-msgid "Cannot open data connection. Maybe your firewall prevents this?"
-msgstr ""
-"Не можам да отворам врска за податоци. Можеби Вашиот заштитен ѕид го "
-"спречува ова?"
-
-#: ../daemon/gvfsbackendftp.c:248
-msgid "Data connection closed"
-msgstr "Врската за податоци е затворена"
-
-#: ../daemon/gvfsbackendftp.c:255 ../daemon/gvfsbackendftp.c:259
-msgid "Operation failed"
-msgstr "Операцијата не успеа"
-
-#: ../daemon/gvfsbackendftp.c:264
-msgid "No space left on server"
-msgstr "Нема преостанато место на серверот"
-
-#: ../daemon/gvfsbackendftp.c:272 ../daemon/gvfsbackendsftp.c:3868
-msgid "Operation unsupported"
-msgstr "Операцијата не е поддржана"
-
-#: ../daemon/gvfsbackendftp.c:276 ../daemon/gvfsbackendsftp.c:289
-msgid "Permission denied"
-msgstr "Пристапот е одбиен"
-
-#: ../daemon/gvfsbackendftp.c:280
-msgid "Page type unknown"
-msgstr "Типот на страницата е непознат"
-
-#: ../daemon/gvfsbackendftp.c:284 ../daemon/gvfsbackendftp.c:2211
-msgid "Invalid filename"
-msgstr "Невалидно име на датотека"
-
-#: ../daemon/gvfsbackendftp.c:288 ../daemon/gvfsbackendftp.c:364
-#: ../daemon/gvfsbackendftp.c:393 ../daemon/gvfsbackendftp.c:412
-#: ../daemon/gvfsbackendftp.c:425 ../daemon/gvfsbackendftp.c:817
-msgid "Invalid reply"
-msgstr "Невалиден одговор"
-
-#: ../daemon/gvfsbackendftp.c:532
-msgid "broken transmission"
-msgstr "прекинат пренос"
-
-#: ../daemon/gvfsbackendftp.c:677 ../daemon/gvfsbackendftp.c:837
-msgid "Could not connect to host"
-msgstr "Не можам да се врзам за хостот"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendftp.c:488
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "Внесете лозинка за FTP како корисник %s на %s"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:1337
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "Внесете лозинка за ftp на %s"
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for FTP on %s"
+msgstr "Внесете лозинка за FTP на %s"
 
-#: ../daemon/gvfsbackendftp.c:1362 ../daemon/gvfsbackendsftp.c:874
-msgid "Password dialog cancelled"
-msgstr "Дијалог прозорецот за лозинка беше откажан"
-
-#: ../daemon/gvfsbackendftp.c:1441
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "ftp на %s"
+#| msgid "/ on %s"
+msgid "FTP on %s"
+msgstr "FTP на %s"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:1445
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "ftp како %s на %s"
-
-#: ../daemon/gvfsbackendftp.c:1529 ../daemon/gvfsbackendsftp.c:1958
-#: ../daemon/gvfsbackendsftp.c:3550
-msgid "File is directory"
-msgstr "Датотеката е директориум"
-
-#: ../daemon/gvfsbackendftp.c:1751 ../daemon/gvfsbackendftp.c:2326
-msgid "backups not supported yet"
-msgstr "правењето на резерви се уште не е поддржано"
-
-#: ../daemon/gvfsbackendftp.c:1828
-msgid "filename too long"
-msgstr "името на датотеката е преголемо"
+#| msgid "ftp as %s on %s"
+msgid "FTP as %s on %s"
+msgstr "FTP како %s на %s"
 
-#: ../daemon/gvfsbackendftp.c:2345
-msgid "Invalid destination filename"
-msgstr "Невалидно име на дестинациска датотека"
+#: ../daemon/gvfsbackendftp.c:727
+msgid "Insufficient permissions"
+msgstr "Немате доволно пермисии"
 
-#: ../daemon/gvfsbackendgphoto2.c:501
+#: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
 msgstr "%s: %d: директориумот или датотеката постои"
 
-#: ../daemon/gvfsbackendgphoto2.c:508
+#: ../daemon/gvfsbackendgphoto2.c:513
 #, c-format
 msgid "%s: %d: No such file or directory"
 msgstr "%s: %d: нема таква датотека или директориум"
 
-#: ../daemon/gvfsbackendgphoto2.c:514
+#: ../daemon/gvfsbackendgphoto2.c:519
 #, c-format
 msgid "%s: %d: Invalid filename"
 msgstr "%s: %d: невалидно име на датотека"
 
-#: ../daemon/gvfsbackendgphoto2.c:520
+#: ../daemon/gvfsbackendgphoto2.c:525
 #, c-format
 msgid "%s: %d: Not Supported"
 msgstr "%s: %d: не е поддржано"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:693
+#: ../daemon/gvfsbackendgphoto2.c:716
+#: ../daemon/gvfsbackendgphoto2.c:722
 #, 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:841 ../monitor/gphoto2/ggphoto2volume.c:183
+#: ../daemon/gvfsbackendgphoto2.c:945
+#: ../monitor/gphoto2/ggphoto2volume.c:197
+#: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
 msgstr "%s камера"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:844 ../monitor/gphoto2/ggphoto2volume.c:178
+#: ../daemon/gvfsbackendgphoto2.c:948
+#: ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s пуштач на аудио"
 
-#: ../daemon/gvfsbackendgphoto2.c:853 ../monitor/gphoto2/ggphoto2volume.c:192
+#: ../daemon/gvfsbackendgphoto2.c:957
+#: ../monitor/gphoto2/ggphoto2volume.c:203
+#: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:855 ../monitor/gphoto2/ggphoto2volume.c:190
+#: ../daemon/gvfsbackendgphoto2.c:959
+#: ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Пуштач на аудио"
 
-#: ../daemon/gvfsbackendgphoto2.c:1325 ../daemon/gvfsbackendgphoto2.c:2008
-msgid "Failed to get folder list"
-msgstr "Не успеав да земам листа на папки"
-
-#: ../daemon/gvfsbackendgphoto2.c:1442
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Не е одреден уред"
 
-#: ../daemon/gvfsbackendgphoto2.c:1459
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Не можам да креирам содржина за gphoto2"
 
-#: ../daemon/gvfsbackendgphoto2.c:1469
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Грешка при креирањето на камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:1482 ../daemon/gvfsbackendgphoto2.c:1492
+#: ../daemon/gvfsbackendgphoto2.c:1609
+#: ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Грешка во вчитувањето на информации за уредот"
 
-#: ../daemon/gvfsbackendgphoto2.c:1504
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Грешка во барањето на информации за уредот"
 
-#: ../daemon/gvfsbackendgphoto2.c:1514
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Грешка во добивањето на информации од уредот"
 
-#: ../daemon/gvfsbackendgphoto2.c:1527
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Грешка во поставувањето на портата за комуникација на камерата"
 
-#: ../daemon/gvfsbackendgphoto2.c:1538
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Грешка во иницијализирањето на камерата"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1552
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 точка за монтирање на %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1627
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Не е одредена камера"
 
-#: ../daemon/gvfsbackendgphoto2.c:1719
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Грешка при креирањето на објект датотека"
 
-#: ../daemon/gvfsbackendgphoto2.c:1733
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Грешка во добивањето на датотека"
 
-#: ../daemon/gvfsbackendgphoto2.c:1742
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Грешка во добивањето на податоци од датотеката"
 
-#: ../daemon/gvfsbackendgphoto2.c:1836 ../daemon/gvfsbackendgphoto2.c:3010
+#: ../daemon/gvfsbackendgphoto2.c:1907
+#, c-format
+msgid "Malformed icon identifier '%s'"
+msgstr "Оштетен идентификатор на икона „%s“"
+
+#: ../daemon/gvfsbackendgphoto2.c:1983
+#: ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Грешка во барањето во стримот на камерата %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1975 ../daemon/gvfsbackendsmbbrowse.c:1112
+#: ../daemon/gvfsbackendgphoto2.c:2123
+#: ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Не е директориум"
 
-#: ../daemon/gvfsbackendgphoto2.c:2071
+#: ../daemon/gvfsbackendgphoto2.c:2156
+msgid "Failed to get folder list"
+msgstr "Не успеав да земам листа на папки"
+
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Не успеав да земам листа на датотеки"
 
-#: ../daemon/gvfsbackendgphoto2.c:2360
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Грешка при креирањето на директориум"
 
-#: ../daemon/gvfsbackendgphoto2.c:2568
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "Името веќе постои"
 
-#: ../daemon/gvfsbackendgphoto2.c:2579 ../daemon/gvfsbackendgphoto2.c:3200
+#: ../daemon/gvfsbackendgphoto2.c:2734
+#: ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "Името е предолго"
 
-#: ../daemon/gvfsbackendgphoto2.c:2589 ../daemon/gvfsbackendgphoto2.c:3211
-msgid "Error renaming dir"
-msgstr "Грешка во преименувањето на директориумот"
+#: ../daemon/gvfsbackendgphoto2.c:2744
+#: ../daemon/gvfsbackendgphoto2.c:3374
+#| msgid "Error creating directory"
+msgid "Error renaming directory"
+msgstr "Грешка при преименувањето на директориум"
 
-#: ../daemon/gvfsbackendgphoto2.c:2601 ../daemon/gvfsbackendgphoto2.c:3223
+#: ../daemon/gvfsbackendgphoto2.c:2757
+#: ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Грешка во преименувањето на датотеката"
 
-#: ../daemon/gvfsbackendgphoto2.c:2664
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Directory „%s“ не е празен"
 
-#: ../daemon/gvfsbackendgphoto2.c:2675
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Грешка во бришењето на директориумот"
 
-#: ../daemon/gvfsbackendgphoto2.c:2700
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Грешка во бришењето на датотеката"
 
-#: ../daemon/gvfsbackendgphoto2.c:2752
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Не можам да запишам во директориумот"
 
-#: ../daemon/gvfsbackendgphoto2.c:2799
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Не можам да алоцирам нова датотека на која што ќе додадам"
 
-#: ../daemon/gvfsbackendgphoto2.c:2813
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Не можам да ја прочитам датотеката на која што треба да додадам"
 
-#: ../daemon/gvfsbackendgphoto2.c:2823
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Не можам да ги добијам податоците од датотеката на која што треба да додадам"
 
-#: ../daemon/gvfsbackendgphoto2.c:3109
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Грешка во запишувањето на датотеката"
 
-#: ../daemon/gvfsbackendgphoto2.c:3156
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Не е поддржано (не е истиот директориум)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3168
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Не е поддржано (src е директориум, dst е директориум)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
+#| msgid "Not supported (src is dir, dst is dir)"
+msgid "Not supported (the source is a directory, the destination is a directory too)"
+msgstr "Не е поддржано (изворот е директориум и дестинацијата е директориум исто така)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3176
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "Не е поддржано (src е датотека, dst е постоечка датотека)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
+#| msgid "Not supported (src is dir, dst is existing file)"
+msgid "Not supported (the source is a directory, but the destination is an existing file)"
+msgstr "Не е поддржано (изворот е датотека, но дестинацијата е постоечка датотека)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3188
-msgid "Not supported (src is file, dst is dir)"
-msgstr "Не е поддржано (src е датотека, dst е директориум)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
+#| msgid "Not supported (src is file, dst is dir)"
+msgid "Not supported (the source is a file, but the destination is a directory)"
+msgstr "Не е поддржано (изворот е датотека, но дестинацијата е директориум)"
 
-#: ../daemon/gvfsbackendhttp.c:241
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "Грешка на HTTP клиентот: %s"
 
-#: ../daemon/gvfsbackendhttp.c:560 ../daemon/gvfsbackendsftp.c:1882
-#: ../daemon/gvfsbackendsmb.c:1301 ../daemon/gvfsbackendtrash.c:1006
-#: ../daemon/gvfsdaemonutils.c:211
-msgid " (invalid encoding)"
-msgstr " (невалидно енкодирање)"
-
-#: ../daemon/gvfsbackendlocaltest.c:853
+#: ../daemon/gvfsbackendlocaltest.c:855
 msgid "Directory notification not supported"
 msgstr "Известувањето за директориуми не е поддржано"
 
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:268 ../daemon/gvfsbackendsmbbrowse.c:699
+#: ../daemon/gvfsbackendnetwork.c:247
+#: ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "Windows мрежа"
 
-#. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackendnetwork.c:392
-msgid "Local Network"
-msgstr "Локална мрежа"
-
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:862
+#: ../daemon/gvfsbackendnetwork.c:873
 msgid "Network Location Monitor"
 msgstr "Надгледувач на локации на мрежите"
 
-#. Mount was successful
+#. 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:442 ../daemon/gvfsbackendsmb.c:557
-#: ../daemon/gvfsbackendsmb.c:1294
+#: ../daemon/gvfsbackendobexftp.c:682
+#: ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s на %s"
 
-#: ../daemon/gvfsbackendobexftp.c:699
+#: ../daemon/gvfsbackendobexftp.c:891
+msgid "USB support missing. Please contact your software vendor"
+msgstr "Недостасува поддршка за USB. Контактирајте со Вашиот добавувач на софтвер"
+
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "Врската со уредот е изгубена"
 
-#: ../daemon/gvfsbackendobexftp.c:1194
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "Уредот бара ажурирање на софтверот"
 
-#: ../daemon/gvfsbackendsftp.c:281
+#: ../daemon/gvfsbackendobexftp.c:1855
+#: ../daemon/gvfsbackendsmb.c:1973
+#, c-format
+msgid "Error deleting file: %s"
+msgstr "Грешка во бришењето на датотеката: %s"
+
+#: ../daemon/gvfsbackendsftp.c:302
+#: ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "ssh програмата неочекувано излезе"
 
-#: ../daemon/gvfsbackendsftp.c:296
+#: ../daemon/gvfsbackendsftp.c:317
 msgid "Hostname not known"
 msgstr "Името на хостот не е познато"
 
-#: ../daemon/gvfsbackendsftp.c:303
+#: ../daemon/gvfsbackendsftp.c:324
 msgid "No route to host"
 msgstr "Нема рута до хостот"
 
-#: ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:331
 msgid "Connection refused by server"
 msgstr "Врската е одбиена од серверот"
 
-#: ../daemon/gvfsbackendsftp.c:317
+#: ../daemon/gvfsbackendsftp.c:338
 msgid "Host key verification failed"
 msgstr "Проверката на клучот на хостот не успеа"
 
-#: ../daemon/gvfsbackendsftp.c:400
+#: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
 msgstr "Не успеав да ја подигнам програмата ssh"
 
-#: ../daemon/gvfsbackendsftp.c:416
+#: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "Не успеав да ја подигнам програмата ssh: %s"
 
-#: ../daemon/gvfsbackendsftp.c:528 ../daemon/gvfsbackendsftp.c:780
+#: ../daemon/gvfsbackendsftp.c:620
+#: ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "Времето за најава истече"
 
-#: ../daemon/gvfsbackendsftp.c:858
-msgid "Enter passphrase for key"
-msgstr "Внесете тајна фраза за клучот"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:958
+#, c-format
+#| msgid "Enter passphrase for key"
+msgid "Enter passphrase for key for ssh as %s on %s"
+msgstr "Внесете тајна фраза за клучот за ssh како %s на %s"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:961
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for ssh as %s on %s"
+msgstr "Внесете лозинка за ssh како %s на %s"
 
-#: ../daemon/gvfsbackendsftp.c:860
-msgid "Enter password"
-msgstr "Внесете лозинка"
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:965
+#, c-format
+#| msgid "Enter passphrase for key"
+msgid "Enter passphrase for key for ssh on %s"
+msgstr "Внесете тајна фраза за клучот за ssh на %s"
 
-#: ../daemon/gvfsbackendsftp.c:921
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:968
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for ssh on %s"
+msgstr "Внесете лозинка за ssh на %s"
+
+#: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
 msgstr "Не можам да ја испратам лозинката"
 
-#: ../daemon/gvfsbackendsftp.c:929
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
 msgstr "Најави се секако"
 
-#: ../daemon/gvfsbackendsftp.c:929
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
 msgstr "Откажи најава"
 
-#: ../daemon/gvfsbackendsftp.c:939
+#: ../daemon/gvfsbackendsftp.c:1065
 #, c-format
 msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
 "This happens when you log in to a computer the first time.\n"
 "\n"
-"The identity sent by the remote computer is %s. If you want to be absolutely "
-"sure it is safe to continue, contact the system administrator."
+"The identity sent by the remote computer is %s. If you want to be absolutely sure it is safe to continue, contact the system administrator."
 msgstr ""
 "Идентитетот на далечниот компјутер (%s) е непознат.\n"
 "Ова се случува кога се најавувате на некој компјутер з апрв пат.\n"
 "\n"
-"Идентитетот испратен на далечниот компјутер  %s. Ако сакате да бидете "
-"апсолутно сигурни дека е сигурно да продолжите, контактирајте го Вашиот "
-"систем администратор."
+"Идентитетот испратен на далечниот компјутер  %s. Ако сакате да бидете апсолутно сигурни дека е сигурно да продолжите, контактирајте го Вашиот систем администратор."
 
-#: ../daemon/gvfsbackendsftp.c:959
+#: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
 msgstr "Дијалогот за најава е откажан"
 
-#: ../daemon/gvfsbackendsftp.c:979
+#: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
 msgstr "Не можам да испратам потврда за идентитет"
 
-#: ../daemon/gvfsbackendsftp.c:1472 ../daemon/gvfsbackendsftp.c:1495
+#: ../daemon/gvfsbackendsftp.c:1643
+#: ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
 msgstr "Грешка во протоколот"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1519
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp on %s"
-msgstr "sftp на %s"
+#| msgid "%s on %s"
+msgid "SFTP for %s on %s"
+msgstr "SFTP за %s на %s"
 
-#: ../daemon/gvfsbackendsftp.c:1543
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1694
+#, c-format
+#| msgid "/ on %s"
+msgid "SFTP on %s"
+msgstr "SFTP на %s"
+
+#: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "Не успеав да најдам поддржана ssh команда"
 
-#: ../daemon/gvfsbackendsftp.c:1967
+#: ../daemon/gvfsbackendsftp.c:2009
+#: ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477
+#: ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544
+#: ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680
+#: ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801
+#: ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025
+#: ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178
+#: ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246
+#: ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473
+#: ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560
+#: ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914
+#: ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114
+#: ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209
+#: ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345
+#: ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438
+#: ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506
+#: ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536
+#: ../daemon/gvfsbackendsftp.c:4614
+msgid "Invalid reply received"
+msgstr "Добиен е невалиден одговор"
+
+#: ../daemon/gvfsbackendsftp.c:2257
+#: ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsdaemonutils.c:211
+msgid " (invalid encoding)"
+msgstr " (невалидно енкодирање)"
+
+#: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
 msgstr "Неуспех"
 
-#: ../daemon/gvfsbackendsftp.c:2023 ../daemon/gvfsbackendsftp.c:2082
-#: ../daemon/gvfsbackendsftp.c:2093 ../daemon/gvfsbackendsftp.c:2149
-#: ../daemon/gvfsbackendsftp.c:2235 ../daemon/gvfsbackendsftp.c:2285
-#: ../daemon/gvfsbackendsftp.c:2331 ../daemon/gvfsbackendsftp.c:2406
-#: ../daemon/gvfsbackendsftp.c:2513 ../daemon/gvfsbackendsftp.c:2553
-#: ../daemon/gvfsbackendsftp.c:2603 ../daemon/gvfsbackendsftp.c:2672
-#: ../daemon/gvfsbackendsftp.c:2692 ../daemon/gvfsbackendsftp.c:2844
-#: ../daemon/gvfsbackendsftp.c:2869 ../daemon/gvfsbackendsftp.c:2924
-#: ../daemon/gvfsbackendsftp.c:2981 ../daemon/gvfsbackendsftp.c:3252
-#: ../daemon/gvfsbackendsftp.c:3319 ../daemon/gvfsbackendsftp.c:3448
-#: ../daemon/gvfsbackendsftp.c:3483 ../daemon/gvfsbackendsftp.c:3511
-#: ../daemon/gvfsbackendsftp.c:3619 ../daemon/gvfsbackendsftp.c:3673
-#: ../daemon/gvfsbackendsftp.c:3707 ../daemon/gvfsbackendsftp.c:3741
-#: ../daemon/gvfsbackendsftp.c:3756 ../daemon/gvfsbackendsftp.c:3771
-#: ../daemon/gvfsbackendsftp.c:3849
-msgid "Invalid reply received"
-msgstr "Добиен е невалиден одговор"
+#: ../daemon/gvfsbackendsftp.c:2450
+#, c-format
+msgid "Invalid icon_id '%s' in OpenIconForRead"
+msgstr "Невалиден icon_id „%s“ во OpenIconForRead"
 
-#: ../daemon/gvfsbackendsftp.c:2351
+#: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "Грешка при креирањето на бекап датотека: %s"
 
-#: ../daemon/gvfsbackendsftp.c:2754
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "Не успеав да ја создадам привремената датотека"
 
-#: ../daemon/gvfsbackendsftp.c:3545 ../daemon/gvfsbackendsmb.c:1793
-msgid "Can't move directory over directory"
-msgstr "Не можам да го преместам директориумот над друг директориум"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+#| msgid "Password required for share %s on %s"
+msgid "Password required for %s"
+msgstr "Потребна е лозинка за %s"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "Windows споделувања на %s"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "Не успеав да добијам листа на споделувања од серверот"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "Не е обична датотека"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Сервис за датотечен систем за Windows мрежа"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:216
+#: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
 msgstr "Потребна е лозинка за споделувањето %s на %s"
 
-#: ../daemon/gvfsbackendsmb.c:471 ../daemon/gvfsbackendsmb.c:511
+#: ../daemon/gvfsbackendsmb.c:494
+#: ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "Внатрешна грешка (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:550
+#: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
 msgstr "Не успеав да го монтирам споделувањето од Windows"
 
-#: ../daemon/gvfsbackendsmb.c:717 ../daemon/gvfsbackendsmb.c:1173
+#: ../daemon/gvfsbackendsmb.c:788
+#: ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "Неподдржан тип на хостирање"
 
-#: ../daemon/gvfsbackendsmb.c:1237
+#: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "Не успеа креирањето на бекап датотека: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1695
-#, c-format
-msgid "Error deleting file: %s"
-msgstr "Грешка во бришењето на датотеката: %s"
+#: ../daemon/gvfsbackendsmb.c:1734
+#| msgid "Invalid attribute info list content"
+msgid "Invalid attribute type (uint64 expected)"
+msgstr "Невалиден тип на атрибут (се очекуваше uint64)"
 
-#: ../daemon/gvfsbackendsmb.c:1769
+#: ../daemon/gvfsbackendsmb.c:1922
+#| msgid "Target file already exists"
+msgid "Can't rename file, filename already exists"
+msgstr "Не можам да ја преименувам датотеката, името на датотеката веќе постои"
+
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Грешка во преместувањето на датотеката: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1841
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Грешка во отстранувањето на целната датотека: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1865
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Не можам да го преместам директориумот рекурзивно"
 
-#: ../daemon/gvfsbackendsmb.c:1928
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
 msgstr "Сервис за датотечен систем на Windows споделувања"
 
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:707
-#, c-format
-msgid "Windows shares on %s"
-msgstr "Windows споделувања на %s"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:799 ../daemon/gvfsbackendsmbbrowse.c:845
-msgid "The file is not a mountable"
-msgstr "Оваа датотека не може да се монтира"
+#: ../daemon/gvfsbackendtrash.c:370
+#: ../daemon/gvfsbackendtrash.c:426
+msgid "The trash folder may not be deleted"
+msgstr "Папката со ѓубре не може да се брише"
 
-#: ../daemon/gvfsbackendsmbbrowse.c:867
-msgid "Not a regular file"
-msgstr "Не е обична датотека"
+#: ../daemon/gvfsbackendtrash.c:387
+#: ../daemon/gvfsbackendtrash.c:440
+msgid "Items in the trash may not be modified"
+msgstr "Предметите во ѓубрето не може да се бришат"
 
-#: ../daemon/gvfsbackendsmbbrowse.c:1224
-msgid "Windows Network Filesystem Service"
-msgstr "Сервис за датотечен систем за Windows мрежа"
-
-#. translators: This is the name of the backend
 #. Translators: this is the display name of the backend
-#: ../daemon/gvfsbackendtrash.c:641 ../daemon/gvfsbackendtrash.c:1229
+#. translators: This is the name of the backend
+#: ../daemon/gvfsbackendtrash.c:742
+#: ../daemon/gvfsbackendtrash.c:850
 msgid "Trash"
 msgstr "Ѓубре"
 
-#: ../daemon/gvfsbackendtrash.c:1019
-#, c-format
-msgid "%s (in trash)"
-msgstr "%s (во ѓубрето)"
-
-#: ../daemon/gvfsbackendtrash.c:1330
-msgid "Can't delete trash"
-msgstr "Не можам да ја избришам корпата за ѓубре"
-
-#: ../daemon/gvfsbackendtrash.c:1677 ../daemon/gvfsbackendtrash.c:1752
-msgid "Trash directory notification not supported"
-msgstr "Не е поддржано известувањето за директориумот за ѓубре"
-
-#: ../daemon/gvfsdaemon.c:1032
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Невалиден тип на бекенд"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "Грешка при испраќањето на fd: %s"
-
-#: ../daemon/gvfsjobcloseread.c:112 ../daemon/gvfsjobclosewrite.c:120
-#: ../daemon/gvfsjobcopy.c:169 ../daemon/gvfsjobcreatemonitor.c:140
-#: ../daemon/gvfsjobcreatemonitor.c:151 ../daemon/gvfsjobcreatemonitor.c:174
-#: ../daemon/gvfsjobcreatemonitor.c:192 ../daemon/gvfsjobdelete.c:122
-#: ../daemon/gvfsjobenumerate.c:256 ../daemon/gvfsjobmakedirectory.c:122
-#: ../daemon/gvfsjobmount.c:109 ../daemon/gvfsjobmountmountable.c:156
-#: ../daemon/gvfsjobmove.c:168 ../daemon/gvfsjobopenforread.c:130
-#: ../daemon/gvfsjobopenforwrite.c:148 ../daemon/gvfsjobopenforwrite.c:162
-#: ../daemon/gvfsjobopenforwrite.c:176 ../daemon/gvfsjobqueryattributes.c:135
-#: ../daemon/gvfsjobqueryfsinfo.c:131 ../daemon/gvfsjobqueryinfo.c:149
-#: ../daemon/gvfsjobread.c:120 ../daemon/gvfsjobseekread.c:119
-#: ../daemon/gvfsjobseekwrite.c:119 ../daemon/gvfsjobsetattribute.c:154
-#: ../daemon/gvfsjobsetdisplayname.c:127 ../daemon/gvfsjobtrash.c:122
-#: ../daemon/gvfsjobunmountmountable.c:132
-#: ../daemon/gvfsjobunmountmountable.c:146 ../daemon/gvfsjobupload.c:169
-#: ../daemon/gvfsjobwrite.c:120
-msgid "Operation not supported by backend"
-msgstr "Операцијата не е поддржана од бекендот"
+#| msgid "Error sending fd: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "Грешка при испраќањето на опишувач: %s"
+
+#: ../daemon/gvfsftpconnection.c:180
+#| msgid "Unexpected reply from server"
+msgid "Unexpected end of stream"
+msgstr "Неочекуван крај на стримот"
+
+#: ../daemon/gvfsftpconnection.c:196
+#: ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:411
+#: ../daemon/gvfsftptask.c:839
+msgid "Invalid reply"
+msgstr "Невалиден одговор"
+
+#: ../daemon/gvfsftpconnection.c:392
+#| msgid "Cannot open data connection. Maybe your firewall prevents this?"
+msgid "Failed to create active FTP connection. Maybe your router does not support this?"
+msgstr "Не успеав да креирам активна FTP врска. Можеби Вашиот рутер не го поддржува тоа?"
+
+#: ../daemon/gvfsftpconnection.c:399
+msgid "Failed to create active FTP connection."
+msgstr "Не успеав да креирам активна FTP врска."
+
+#: ../daemon/gvfsftpfile.c:170
+msgid "Filename contains invalid characters."
+msgstr "Името на датотеката содржи невалидни знаци."
+
+#: ../daemon/gvfsftptask.c:261
+msgid "The FTP server is busy. Try again later"
+msgstr "FTP серверот е зафатен. Пробајте пак"
+
+#: ../daemon/gvfsftptask.c:355
+msgid "Accounts are unsupported"
+msgstr "Сметки не се поддржани"
+
+#: ../daemon/gvfsftptask.c:359
+msgid "Host closed connection"
+msgstr "Хостот ја затвори врската"
+
+#: ../daemon/gvfsftptask.c:363
+msgid "Cannot open data connection. Maybe your firewall prevents this?"
+msgstr "Не можам да отворам врска за податоци. Можеби Вашиот заштитен ѕид го спречува ова?"
 
-#: ../daemon/gvfsjobmakesymlink.c:126
+#: ../daemon/gvfsftptask.c:367
+msgid "Data connection closed"
+msgstr "Врската за податоци е затворена"
+
+#: ../daemon/gvfsftptask.c:374
+#: ../daemon/gvfsftptask.c:378
+msgid "Operation failed"
+msgstr "Операцијата не успеа"
+
+#: ../daemon/gvfsftptask.c:383
+msgid "No space left on server"
+msgstr "Нема преостанато место на серверот"
+
+#: ../daemon/gvfsftptask.c:395
+#| msgid "Unsupported seek type"
+msgid "Unsupported network protocol"
+msgstr "Неподдржан мрежен протокол"
+
+#: ../daemon/gvfsftptask.c:403
+msgid "Page type unknown"
+msgstr "Типот на страницата е непознат"
+
+#: ../daemon/gvfsftptask.c:407
+msgid "Invalid filename"
+msgstr "Невалидно име на датотека"
+
+#: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
 msgstr "Симболичките врски не се креирани од бекендот"
 
-#: ../daemon/gvfsjobsetattribute.c:123
+#: ../daemon/gvfsjobsetattribute.c:120
 msgid "Invalid dbus message"
 msgstr "Невалидна порака од dbus"
 
+#: ../daemon/gvfsjobunmount.c:156
+#| msgid "Filesystem"
+msgid "Filesystem is busy"
+msgstr "Датотечниот систем е зафатен"
+
 #: ../daemon/main.c:45
+#: ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
 msgstr "Замени стар демон."
 
@@ -1084,473 +1979,1182 @@ msgstr "Замени стар демон."
 msgid "Don't start fuse."
 msgstr "Не го стартувај fuse."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS демон"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "Главен даемон за GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76
+#: ../daemon/main.c:78
+#: ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:101 ../programs/gvfs-info.c:337
-#: ../programs/gvfs-ls.c:386 ../programs/gvfs-mkdir.c:59
-#: ../programs/gvfs-move.c:97 ../programs/gvfs-open.c:131
-#: ../programs/gvfs-open.c:144 ../programs/gvfs-save.c:165
+#: ../daemon/main.c:80
+#: ../metadata/meta-daemon.c:720
+#: ../programs/gvfs-cat.c:163
+#: ../programs/gvfs-cat.c:176
+#: ../programs/gvfs-copy.c:123
+#: ../programs/gvfs-info.c:371
+#: ../programs/gvfs-ls.c:392
+#: ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98
+#: ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60
+#: ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141
+#: ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165
+#: ../programs/gvfs-set-attribute.c:128
 #: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Пробајте „%s --help“ за повеќе информации."
 
-#: ../daemon/mount.c:439
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
 msgstr "Невалидни аргументи од креираното дете"
 
-#: ../daemon/mount.c:740
+#: ../daemon/mount.c:779
 #, c-format
 msgid "Automount failed: %s"
 msgstr "Автоматското монтирање не успеа: %s"
 
-#: ../daemon/mount.c:785
+#: ../daemon/mount.c:825
+#: ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Одредената локација не е монтирана"
 
-#: ../daemon/mount.c:790
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "Одредената локација не е поддржана"
 
-#: ../daemon/mount.c:954
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "Локацијата е веќе монтирана"
 
-#: ../daemon/mount.c:962
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "Локацијата не може да се монтира"
 
-#: ../monitor/hal/ghaldrive.c:130
+#: ../metadata/meta-daemon.c:130
+#: ../metadata/meta-daemon.c:336
+#: ../metadata/meta-daemon.c:390
+#: ../metadata/meta-daemon.c:419
+#: ../metadata/meta-daemon.c:449
+#, c-format
+#| msgid "Cannot find drive %s"
+msgid "Can't find metadata file %s"
+msgstr "Не можам да ја пронајдам датотеката со метаподатоци %s"
+
+#: ../metadata/meta-daemon.c:160
+#: ../metadata/meta-daemon.c:179
+msgid "Unable to set metadata key"
+msgstr "Не успеав да го поставам metadata клучот"
+
+#: ../metadata/meta-daemon.c:197
+#: ../metadata/meta-daemon.c:399
+msgid "Unable to unset metadata key"
+msgstr "Не успеав да го избришам metadata клучот"
+
+#: ../metadata/meta-daemon.c:428
+msgid "Unable to remove metadata keys"
+msgstr "Не успеав да ги избришам metadata клучевите"
+
+#: ../metadata/meta-daemon.c:459
+msgid "Unable to move metadata keys"
+msgstr "Не успеав да ги преместам metadata клучевите"
+
+#: ../metadata/meta-daemon.c:704
+#| msgid "GVFS Daemon"
+msgid "GVFS Metadata Daemon"
+msgstr "GVFS демон за метаподатоци"
+
+#: ../metadata/meta-daemon.c:707
+#| msgid "Main daemon for GVFS"
+msgid "Metadata daemon for GVFS"
+msgstr "Демон за метаподатоци за GVFS"
+
+#: ../monitor/gdu/gdu-volume-monitor-daemon.c:40
+msgid "GVfs GDU Volume Monitor"
+msgstr "GVfs GDU монитор на простори"
+
+#: ../monitor/gdu/ggdudrive.c:168
+#: ../monitor/hal/ghaldrive.c:179
+msgid "Floppy Drive"
+msgstr "Флопи уред"
+
+#: ../monitor/gdu/ggdudrive.c:258
+#, c-format
+msgid "Unnamed Drive (%s)"
+msgstr "Неименувам уред (%s)"
+
+#: ../monitor/gdu/ggdudrive.c:260
+#| msgid "Tape Drive"
+msgid "Unnamed Drive"
+msgstr "Неименуван уред"
+
+#: ../monitor/gdu/ggdudrive.c:561
+#, 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 "Не успеав да го извадам медиумот; еден или повеќе простори на медиумите се зафатени."
+
+#: ../monitor/gdu/ggdudrive.c:1017
+msgid ""
+"Start drive in degraded mode?\n"
+"Starting a drive in degraded mode means that the drive is no longer tolerant to failures. Data on the drive may be irrevocably lost if a component fails."
+msgstr ""
+"Да го стартувам уредот во оштетен режим?\n"
+"Стартувањето на уредот во оштетен режим значи дека уредот повеќе не е толерантен на падови. Податоците на уредот може да се загубат засекогаш ако некоја компонента се расипе."
+
+#: ../monitor/gdu/ggdudrive.c:1023
+msgid "Start Anyway"
+msgstr "Стартувај и покрај тоа"
+
+#: ../monitor/gdu/ggdumount.c:860
+msgid "One or more programs are preventing the unmount operation."
+msgstr "Една или повеќе програми ја спречуваат операцијата на одмонтирање."
+
+#: ../monitor/gdu/ggdumount.c:988
+msgid "Cannot get LUKS cleartext slave"
+msgstr "Не можам да добијам LUKS cleartext slave"
+
+#: ../monitor/gdu/ggdumount.c:1010
+#, c-format
+msgid "Cannot get LUKS cleartext slave from path `%s'"
+msgstr "Не можам да добијам LUKS cleartext slave од патеката „%s“"
+
+#: ../monitor/gdu/ggduvolume.c:337
+#| msgid "Floppy Drive"
+msgid "Floppy Disk"
+msgstr "Флопи уред"
+
+#: ../monitor/gdu/ggduvolume.c:1097
+#, c-format
+msgid ""
+"Enter a password to unlock the volume\n"
+"The device \"%s\" contains encrypted data on partition %d."
+msgstr ""
+"Внесете лозинка за отклучување на просторот\n"
+"Уредот „%s“ содржи енкриптирани податоци на партицијата %d."
+
+#: ../monitor/gdu/ggduvolume.c:1104
+#, c-format
+msgid ""
+"Enter a password to unlock the volume\n"
+"The device \"%s\" contains encrypted data."
+msgstr ""
+"Внесете лозинка за отклучување на просторот\n"
+"Уредот „%s“ содржи енкриптирани податоци."
+
+#: ../monitor/gdu/ggduvolume.c:1111
+#, c-format
+msgid ""
+"Enter a password to unlock the volume\n"
+"The device %s contains encrypted data."
+msgstr ""
+"Внесете лозинка за отклучување на просторот\n"
+"Уредот %s содржи енкриптирани податоци."
+
+#: ../monitor/gphoto2/hal-utils.c:40
+#: ../monitor/hal/hal-utils.c:40
+msgid "CD-ROM Disc"
+msgstr "CD-ROM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:40
+#: ../monitor/hal/hal-utils.c:40
+msgid "Blank CD-ROM Disc"
+msgstr "Празен CD-ROM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:41
+#: ../monitor/hal/hal-utils.c:41
+msgid "CD-R Disc"
+msgstr "CD-R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:41
+#: ../monitor/hal/hal-utils.c:41
+msgid "Blank CD-R Disc"
+msgstr "Празен CD-R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:42
+#: ../monitor/hal/hal-utils.c:42
+msgid "CD-RW Disc"
+msgstr "CD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:42
+#: ../monitor/hal/hal-utils.c:42
+msgid "Blank CD-RW Disc"
+msgstr "Празен CD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:43
+#: ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43
+#: ../monitor/hal/hal-utils.c:45
+msgid "DVD-ROM Disc"
+msgstr "DVD-ROM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:43
+#: ../monitor/gphoto2/hal-utils.c:45
+#: ../monitor/hal/hal-utils.c:43
+#: ../monitor/hal/hal-utils.c:45
+msgid "Blank DVD-ROM Disc"
+msgstr "Празен DVD-ROM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:44
+#: ../monitor/hal/hal-utils.c:44
+msgid "DVD-RAM Disc"
+msgstr "DVD-RAM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:44
+#: ../monitor/hal/hal-utils.c:44
+msgid "Blank DVD-RAM Disc"
+msgstr "Празен DVD-RAM диск"
+
+#: ../monitor/gphoto2/hal-utils.c:46
+#: ../monitor/hal/hal-utils.c:46
+msgid "DVD-RW Disc"
+msgstr "DVD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:46
+#: ../monitor/hal/hal-utils.c:46
+msgid "Blank DVD-RW Disc"
+msgstr "Празен DVD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:47
+#: ../monitor/hal/hal-utils.c:47
+msgid "DVD+R Disc"
+msgstr "DVD+R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:47
+#: ../monitor/hal/hal-utils.c:47
+msgid "Blank DVD+R Disc"
+msgstr "Празен DVD+R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:48
+#: ../monitor/hal/hal-utils.c:48
+msgid "DVD+RW Disc"
+msgstr "DVD+RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:48
+#: ../monitor/hal/hal-utils.c:48
+msgid "Blank DVD+RW Disc"
+msgstr "Празен DVD+RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:49
+#: ../monitor/hal/hal-utils.c:49
+msgid "DVD+R DL Disc"
+msgstr "DVD+R DL диск"
+
+#: ../monitor/gphoto2/hal-utils.c:49
+#: ../monitor/hal/hal-utils.c:49
+msgid "Blank DVD+R DL Disc"
+msgstr "Празен DVD+R DL диск"
+
+#: ../monitor/gphoto2/hal-utils.c:50
+#: ../monitor/hal/hal-utils.c:50
+msgid "Blu-Ray Disc"
+msgstr "Blu-Ray диск"
+
+#: ../monitor/gphoto2/hal-utils.c:50
+#: ../monitor/hal/hal-utils.c:50
+msgid "Blank Blu-Ray Disc"
+msgstr "Празен Blu-Ray диск"
+
+#: ../monitor/gphoto2/hal-utils.c:51
+#: ../monitor/hal/hal-utils.c:51
+msgid "Blu-Ray R Disc"
+msgstr "Blu-Ray R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:51
+#: ../monitor/hal/hal-utils.c:51
+msgid "Blank Blu-Ray R Disc"
+msgstr "Празен Blu-Ray R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:52
+#: ../monitor/hal/hal-utils.c:52
+msgid "Blu-Ray RW Disc"
+msgstr "Blu-Ray RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:52
+#: ../monitor/hal/hal-utils.c:52
+msgid "Blank Blu-Ray RW Disc"
+msgstr "Празен Blu-Ray RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:53
+#: ../monitor/hal/hal-utils.c:53
+msgid "HD DVD Disc"
+msgstr "HD DVD диск"
+
+#: ../monitor/gphoto2/hal-utils.c:53
+#: ../monitor/hal/hal-utils.c:53
+msgid "Blank HD DVD Disc"
+msgstr "Празен HD DVD диск"
+
+#: ../monitor/gphoto2/hal-utils.c:54
+#: ../monitor/hal/hal-utils.c:54
+msgid "HD DVD-R Disc"
+msgstr "HD DVD-R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:54
+#: ../monitor/hal/hal-utils.c:54
+msgid "Blank HD DVD-R Disc"
+msgstr "Празен HD DVD-R диск"
+
+#: ../monitor/gphoto2/hal-utils.c:55
+#: ../monitor/hal/hal-utils.c:55
+msgid "HD DVD-RW Disc"
+msgstr "HD DVD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:55
+#: ../monitor/hal/hal-utils.c:55
+msgid "Blank HD DVD-RW Disc"
+msgstr "Празен HD DVD-RW диск"
+
+#: ../monitor/gphoto2/hal-utils.c:56
+#: ../monitor/hal/hal-utils.c:56
+msgid "MO Disc"
+msgstr "MO диск"
+
+#: ../monitor/gphoto2/hal-utils.c:56
+#: ../monitor/hal/hal-utils.c:56
+msgid "Blank MO Disc"
+msgstr "Празен MO диск"
+
+#: ../monitor/gphoto2/hal-utils.c:57
+#: ../monitor/hal/hal-utils.c:57
+msgid "Disc"
+msgstr "Диск"
+
+#: ../monitor/gphoto2/hal-utils.c:57
+#: ../monitor/hal/hal-utils.c:57
+msgid "Blank Disc"
+msgstr "Празен диск"
+
+#: ../monitor/hal/ghaldrive.c:127
 msgid "CD-ROM"
 msgstr "CD-ROM"
 
-#: ../monitor/hal/ghaldrive.c:132
+#: ../monitor/hal/ghaldrive.c:129
 msgid "CD-R"
 msgstr "CD-R"
 
-#: ../monitor/hal/ghaldrive.c:134
+#: ../monitor/hal/ghaldrive.c:131
 msgid "CD-RW"
 msgstr "CD-RW"
 
-#: ../monitor/hal/ghaldrive.c:138
+#: ../monitor/hal/ghaldrive.c:135
 msgid "DVD-ROM"
 msgstr "DVD-ROM"
 
-#: ../monitor/hal/ghaldrive.c:140
+#: ../monitor/hal/ghaldrive.c:137
 msgid "DVD+R"
 msgstr "DVD+R"
 
-#: ../monitor/hal/ghaldrive.c:142
+#: ../monitor/hal/ghaldrive.c:139
 msgid "DVD+RW"
 msgstr "DVD+RW"
 
-#: ../monitor/hal/ghaldrive.c:144
+#: ../monitor/hal/ghaldrive.c:141
 msgid "DVD-R"
 msgstr "DVD-R"
 
-#: ../monitor/hal/ghaldrive.c:146
+#: ../monitor/hal/ghaldrive.c:143
 msgid "DVD-RW"
 msgstr "DVD-RW"
 
-#: ../monitor/hal/ghaldrive.c:148
+#: ../monitor/hal/ghaldrive.c:145
 msgid "DVD-RAM"
 msgstr "DVD-RAM"
 
-#: ../monitor/hal/ghaldrive.c:151
+#: ../monitor/hal/ghaldrive.c:148
 msgid "DVD±R"
 msgstr "DVD±R"
 
-#: ../monitor/hal/ghaldrive.c:154
+#: ../monitor/hal/ghaldrive.c:151
 msgid "DVD±RW"
 msgstr "DVD±RW"
 
-#: ../monitor/hal/ghaldrive.c:156
+#: ../monitor/hal/ghaldrive.c:153
 msgid "HDDVD"
 msgstr "HDDVD"
 
-#: ../monitor/hal/ghaldrive.c:158
+#: ../monitor/hal/ghaldrive.c:155
 msgid "HDDVD-r"
 msgstr "HDDVD-r"
 
-#: ../monitor/hal/ghaldrive.c:160
+#: ../monitor/hal/ghaldrive.c:157
 msgid "HDDVD-RW"
 msgstr "HDDVD-RW"
 
-#: ../monitor/hal/ghaldrive.c:162
+#: ../monitor/hal/ghaldrive.c:159
 msgid "Blu-ray"
 msgstr "Blu-ray"
 
-#: ../monitor/hal/ghaldrive.c:164
+#: ../monitor/hal/ghaldrive.c:161
 msgid "Blu-ray-R"
 msgstr "Blu-ray-R"
 
-#: ../monitor/hal/ghaldrive.c:166
+#: ../monitor/hal/ghaldrive.c:163
 msgid "Blu-ray-RE"
 msgstr "Blu-ray-RE"
 
 #. translators: This wis something like "CD-ROM/DVD Drive" or
 #. "CD-RW/Blue-ray Drive" depending on the properties of the drive
-#: ../monitor/hal/ghaldrive.c:172
+#: ../monitor/hal/ghaldrive.c:169
 #, c-format
 msgid "%s/%s Drive"
 msgstr "%s/%s"
 
 #. translators: This wis something like "CD-ROM Drive" or "CD-RW Drive
 #. depending on the properties of the drive
-#: ../monitor/hal/ghaldrive.c:178
+#: ../monitor/hal/ghaldrive.c:175
 #, c-format
 msgid "%s Drive"
 msgstr "%s"
 
-#: ../monitor/hal/ghaldrive.c:182
-msgid "Floppy Drive"
-msgstr "Флопи уред"
-
-#: ../monitor/hal/ghaldrive.c:188
+#: ../monitor/hal/ghaldrive.c:185
 msgid "Software RAID Drive"
 msgstr "Софтверски RAID уред"
 
-#: ../monitor/hal/ghaldrive.c:190
+#: ../monitor/hal/ghaldrive.c:187
 msgid "USB Drive"
 msgstr "USB уред"
 
-#: ../monitor/hal/ghaldrive.c:192
+#: ../monitor/hal/ghaldrive.c:189
 msgid "ATA Drive"
 msgstr "ATA уред"
 
-#: ../monitor/hal/ghaldrive.c:194
+#: ../monitor/hal/ghaldrive.c:191
 msgid "SCSI Drive"
 msgstr "SCSI уред"
 
-#: ../monitor/hal/ghaldrive.c:196
+#: ../monitor/hal/ghaldrive.c:193
 msgid "FireWire Drive"
 msgstr "FireWire уред"
 
-#: ../monitor/hal/ghaldrive.c:200
+#: ../monitor/hal/ghaldrive.c:197
 msgid "Tape Drive"
 msgstr "Уред со ленти"
 
-#: ../monitor/hal/ghaldrive.c:202
+#: ../monitor/hal/ghaldrive.c:199
 msgid "CompactFlash Drive"
 msgstr "CompactFlash уред"
 
-#: ../monitor/hal/ghaldrive.c:204
+#: ../monitor/hal/ghaldrive.c:201
 msgid "MemoryStick Drive"
 msgstr "MemoryStick уред"
 
-#: ../monitor/hal/ghaldrive.c:206
+#: ../monitor/hal/ghaldrive.c:203
 msgid "SmartMedia Drive"
 msgstr "SmartMedia уред"
 
-#: ../monitor/hal/ghaldrive.c:208
+#: ../monitor/hal/ghaldrive.c:205
 msgid "SD/MMC Drive"
 msgstr "SD/MMC уред"
 
-#: ../monitor/hal/ghaldrive.c:210
+#: ../monitor/hal/ghaldrive.c:207
 msgid "Zip Drive"
 msgstr "Zip уред"
 
-#: ../monitor/hal/ghaldrive.c:212
+#: ../monitor/hal/ghaldrive.c:209
 msgid "Jaz Drive"
 msgstr "Jaz уред"
 
-#: ../monitor/hal/ghaldrive.c:214
+#: ../monitor/hal/ghaldrive.c:211
 msgid "Thumb Drive"
 msgstr "Преносен уред"
 
-#: ../monitor/hal/ghaldrive.c:217
+#: ../monitor/hal/ghaldrive.c:214
 msgid "Mass Storage Drive"
 msgstr "Уред за mass storage"
 
-#: ../monitor/hal/ghaldrive.c:723
+#: ../monitor/hal/ghaldrive.c:662
 #, c-format
 msgid "Failed to eject media; one or more volumes on the media are busy."
-msgstr ""
-"Не успеав да ги извадам медиумите; еден или повеќе простори на медиумите се "
-"зафатени."
+msgstr "Не успеав да ги извадам медиумите; еден или повеќе простори на медиумите се зафатени."
 
-#: ../monitor/hal/ghalmount.c:301 ../monitor/hal/ghalvolume.c:152
+#: ../monitor/hal/ghalmount.c:159
+#: ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
 msgstr "%.1f kB"
 
-#: ../monitor/hal/ghalmount.c:306 ../monitor/hal/ghalvolume.c:157
+#: ../monitor/hal/ghalmount.c:164
+#: ../monitor/hal/ghalvolume.c:168
 #, c-format
 msgid "%.1f MB"
 msgstr "%.1f MB"
 
-#: ../monitor/hal/ghalmount.c:311 ../monitor/hal/ghalvolume.c:162
+#: ../monitor/hal/ghalmount.c:169
+#: ../monitor/hal/ghalvolume.c:173
 #, c-format
 msgid "%.1f GB"
 msgstr "%.1f GB"
 
-#: ../monitor/hal/ghalmount.c:433 ../monitor/hal/ghalvolume.c:233
+#: ../monitor/hal/ghalmount.c:323
+#: ../monitor/hal/ghalvolume.c:244
 msgid "Mixed Audio/Data Disc"
 msgstr "Мешан диск со аудио/податоци"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:446 ../monitor/hal/ghalvolume.c:244
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
+#| msgid "%s Media"
+msgid "%s Medium"
 msgstr "%s медиум"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalvolume.c:221
+#: ../monitor/hal/ghalvolume.c:232
 #, c-format
 msgid "%s Encrypted Data"
 msgstr "%s енкриптирани податоци"
 
-#: ../monitor/hal/hal-utils.c:40 ../monitor/gphoto2/hal-utils.c:40
-msgid "CD-ROM Disc"
-msgstr "CD-ROM диск"
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "%s медиум"
 
-#: ../monitor/hal/hal-utils.c:40 ../monitor/gphoto2/hal-utils.c:40
-msgid "Blank CD-ROM Disc"
-msgstr "Празен CD-ROM диск"
+#: ../programs/gvfs-cat.c:37
+#| msgid "%s: missing locations"
+msgid "locations"
+msgstr "локации"
 
-#: ../monitor/hal/hal-utils.c:41 ../monitor/gphoto2/hal-utils.c:41
-msgid "CD-R Disc"
-msgstr "CD-R диск"
+#. Translators: the first %s is the program name, the second one
+#. is the URI of the file, the third is the error message.
+#: ../programs/gvfs-cat.c:57
+#, c-format
+msgid "%s: %s: error opening file: %s\n"
+msgstr "%s: %s: грешка во отворањето на датотеката: %s\n"
 
-#: ../monitor/hal/hal-utils.c:41 ../monitor/gphoto2/hal-utils.c:41
-msgid "Blank CD-R Disc"
-msgstr "Празен CD-R диск"
+#. Translators: the first %s is the program name, the
+#. second one is the URI of the file.
+#: ../programs/gvfs-cat.c:80
+#, c-format
+msgid "%s: %s, error writing to stdout"
+msgstr "%s: %s, грешка, ја запишувам во stdout"
 
-#: ../monitor/hal/hal-utils.c:42 ../monitor/gphoto2/hal-utils.c:42
-msgid "CD-RW Disc"
-msgstr "CD-RW диск"
+#. Translators: the first %s is the program name, the second one
+#. is the URI of the file, the third is the error message.
+#: ../programs/gvfs-cat.c:92
+#, c-format
+msgid "%s: %s: error reading: %s\n"
+msgstr "%s: %s: грешка во читањето: %s\n"
 
-#: ../monitor/hal/hal-utils.c:42 ../monitor/gphoto2/hal-utils.c:42
-msgid "Blank CD-RW Disc"
-msgstr "Празен CD-RW диск"
+#. Translators: the first %s is the program name, the second one
+#. is the URI of the file, the third is the error message.
+#: ../programs/gvfs-cat.c:110
+#, c-format
+msgid "%s: %s:error closing: %s\n"
+msgstr "%s: %s: грешка во затворањето: %s\n"
 
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-msgid "DVD-ROM Disc"
-msgstr "DVD-ROM диск"
+#: ../programs/gvfs-cat.c:136
+msgid "LOCATION... - concatenate LOCATIONS to standard output."
+msgstr "LOCATION... - наведете LOCATIONS на стандардниот влез."
 
-#: ../monitor/hal/hal-utils.c:43 ../monitor/hal/hal-utils.c:45
-#: ../monitor/gphoto2/hal-utils.c:43 ../monitor/gphoto2/hal-utils.c:45
-msgid "Blank DVD-ROM Disc"
-msgstr "Празен DVD-ROM диск"
+#. Translators: this message will appear after the usage string
+#. and before the list of options.
+#: ../programs/gvfs-cat.c:141
+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."
+msgstr "Наведете датотеки од локации и испечати ги на стандардниот излез. Работи самосо алатката cat, но со користење на gvfs локација наместообични датотеки: на пример, можете да користите smb://server/resource/file.txt како локација."
 
-#: ../monitor/hal/hal-utils.c:44 ../monitor/gphoto2/hal-utils.c:44
-msgid "DVD-RAM Disc"
-msgstr "DVD-RAM диск"
+#: ../programs/gvfs-cat.c:148
+msgid "Note: just pipe through cat if you need its formatting option like -n, -T or other."
+msgstr "Забелешка: Само насочете го стрипот со цевка преку cat ако ви требаат опции за форматирање како -n, -T или други."
+
+#: ../programs/gvfs-cat.c:161
+#: ../programs/gvfs-copy.c:121
+#: ../programs/gvfs-info.c:369
+#: ../programs/gvfs-ls.c:390
+#: ../programs/gvfs-mime.c:84
+#: ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109
+#: ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163
+#: ../programs/gvfs-set-attribute.c:126
+#: ../programs/gvfs-tree.c:249
+#, c-format
+msgid "Error parsing commandline options: %s\n"
+msgstr "Грешка при парсирањето на опциите од командната линија: %s\n"
 
-#: ../monitor/hal/hal-utils.c:44 ../monitor/gphoto2/hal-utils.c:44
-msgid "Blank DVD-RAM Disc"
-msgstr "Празен DVD-RAM диск"
+#. Translators: the %s is the program name. This error message
+#. means the user is calling gvfs-cat without any argument.
+#: ../programs/gvfs-cat.c:174
+#: ../programs/gvfs-open.c:152
+#, c-format
+msgid "%s: missing locations"
+msgstr "%s: недостасуваат локации"
 
-#: ../monitor/hal/hal-utils.c:46 ../monitor/gphoto2/hal-utils.c:46
-msgid "DVD-RW Disc"
-msgstr "DVD-RW диск"
+#: ../programs/gvfs-copy.c:44
+#: ../programs/gvfs-move.c:42
+#| msgid "Not a directory"
+msgid "no target directory"
+msgstr "нема целен директориум"
 
-#: ../monitor/hal/hal-utils.c:46 ../monitor/gphoto2/hal-utils.c:46
-msgid "Blank DVD-RW Disc"
-msgstr "Празен DVD-RW диск"
+#: ../programs/gvfs-copy.c:45
+#: ../programs/gvfs-move.c:43
+msgid "show progress"
+msgstr "покажи напредок"
+
+#: ../programs/gvfs-copy.c:46
+#: ../programs/gvfs-move.c:44
+msgid "prompt before overwrite"
+msgstr "прашај пред да запишеш над"
+
+#: ../programs/gvfs-copy.c:47
+msgid "preserve all attributes"
+msgstr "зачувај ги сите атрибути"
+
+#: ../programs/gvfs-copy.c:48
+#: ../programs/gvfs-move.c:45
+#| msgid "Backup file creation failed"
+msgid "backup existing destination files"
+msgstr "направи бекап на постоечките дестинациски датотеки"
 
-#: ../monitor/hal/hal-utils.c:47 ../monitor/gphoto2/hal-utils.c:47
-msgid "DVD+R Disc"
-msgstr "DVD+R диск"
+#: ../programs/gvfs-copy.c:49
+msgid "never follow symbolic links"
+msgstr "никогаш не ги следи симболичките врски"
 
-#: ../monitor/hal/hal-utils.c:47 ../monitor/gphoto2/hal-utils.c:47
-msgid "Blank DVD+R Disc"
-msgstr "Празен DVD+R диск"
+#: ../programs/gvfs-copy.c:78
+#: ../programs/gvfs-move.c:67
+#, c-format
+msgid "progress"
+msgstr "напредок"
 
-#: ../monitor/hal/hal-utils.c:48 ../monitor/gphoto2/hal-utils.c:48
-msgid "DVD+RW Disc"
-msgstr "DVD+RW диск"
+#: ../programs/gvfs-copy.c:115
+msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
+msgstr "SOURCE... DEST - копирај датотека/а од SOURCE во DEST"
 
-#: ../monitor/hal/hal-utils.c:48 ../monitor/gphoto2/hal-utils.c:48
-msgid "Blank DVD+RW Disc"
-msgstr "Празен DVD+RW диск"
+#: ../programs/gvfs-copy.c:132
+#: ../programs/gvfs-move.c:120
+msgid "Missing operand\n"
+msgstr "Недостасува операнд\n"
 
-#: ../monitor/hal/hal-utils.c:49 ../monitor/gphoto2/hal-utils.c:49
-msgid "DVD+R DL Disc"
-msgstr "DVD+R DL диск"
+#: ../programs/gvfs-copy.c:140
+#: ../programs/gvfs-move.c:128
+msgid "Too many arguments\n"
+msgstr "Премногу аргументи\n"
 
-#: ../monitor/hal/hal-utils.c:49 ../monitor/gphoto2/hal-utils.c:49
-msgid "Blank DVD+R DL Disc"
-msgstr "Празен DVD+R DL диск"
+#: ../programs/gvfs-copy.c:149
+#: ../programs/gvfs-move.c:137
+#, c-format
+#| msgid "The file is not a directory"
+msgid "Target %s is not a directory\n"
+msgstr "Целта %s не е диреткриум\n"
 
-#: ../monitor/hal/hal-utils.c:50 ../monitor/gphoto2/hal-utils.c:50
-msgid "Blu-Ray Disc"
-msgstr "Blu-Ray диск"
+#: ../programs/gvfs-copy.c:193
+#, c-format
+msgid "overwrite %s?"
+msgstr "да запишам над %s?"
 
-#: ../monitor/hal/hal-utils.c:50 ../monitor/gphoto2/hal-utils.c:50
-msgid "Blank Blu-Ray Disc"
-msgstr "Празен Blu-Ray диск"
+#: ../programs/gvfs-copy.c:207
+#, c-format
+#| msgid "Error moving file: %s"
+msgid "Error copying file %s: %s\n"
+msgstr "Грешка при копирањето на датотеката %s: %s\n"
 
-#: ../monitor/hal/hal-utils.c:51 ../monitor/gphoto2/hal-utils.c:51
-msgid "Blu-Ray R Disc"
-msgstr "Blu-Ray R диск"
+#: ../programs/gvfs-info.c:37
+msgid "List writable attributes"
+msgstr "Излистај ги запишливите атрибути"
 
-#: ../monitor/hal/hal-utils.c:51 ../monitor/gphoto2/hal-utils.c:51
-msgid "Blank Blu-Ray R Disc"
-msgstr "Празен Blu-Ray R диск"
+#: ../programs/gvfs-info.c:38
+#| msgid "Filesystem"
+msgid "Get filesystem info"
+msgstr "Земи информации за датотечниот систем"
 
-#: ../monitor/hal/hal-utils.c:52 ../monitor/gphoto2/hal-utils.c:52
-msgid "Blu-Ray RW Disc"
-msgstr "Blu-Ray RW диск"
+#: ../programs/gvfs-info.c:39
+#: ../programs/gvfs-ls.c:39
+msgid "The attributes to get"
+msgstr "Атрибути за добивање"
 
-#: ../monitor/hal/hal-utils.c:52 ../monitor/gphoto2/hal-utils.c:52
-msgid "Blank Blu-Ray RW Disc"
-msgstr "Празен Blu-Ray RW диск"
+#: ../programs/gvfs-info.c:40
+#: ../programs/gvfs-ls.c:43
+#: ../programs/gvfs-set-attribute.c:37
+msgid "Don't follow symlinks"
+msgstr "Не ги следи симболичките врски"
 
-#: ../monitor/hal/hal-utils.c:53 ../monitor/gphoto2/hal-utils.c:53
-msgid "HD DVD Disc"
-msgstr "HD DVD диск"
+#: ../programs/gvfs-info.c:50
+#| msgid "Invalid backend type"
+msgid "invalid type"
+msgstr "невалиден тип"
 
-#: ../monitor/hal/hal-utils.c:53 ../monitor/gphoto2/hal-utils.c:53
-msgid "Blank HD DVD Disc"
-msgstr "Празен HD DVD диск"
+#: ../programs/gvfs-info.c:53
+msgid "unknown"
+msgstr "непозната"
 
-#: ../monitor/hal/hal-utils.c:54 ../monitor/gphoto2/hal-utils.c:54
-msgid "HD DVD-R Disc"
-msgstr "HD DVD-R диск"
+#: ../programs/gvfs-info.c:56
+msgid "regular"
+msgstr "регуларна"
 
-#: ../monitor/hal/hal-utils.c:54 ../monitor/gphoto2/hal-utils.c:54
-msgid "Blank HD DVD-R Disc"
-msgstr "Празен HD DVD-R диск"
+#: ../programs/gvfs-info.c:59
+#| msgid "Not a directory"
+msgid "directory"
+msgstr "директориум"
 
-#: ../monitor/hal/hal-utils.c:55 ../monitor/gphoto2/hal-utils.c:55
-msgid "HD DVD-RW Disc"
-msgstr "HD DVD-RW диск"
+#: ../programs/gvfs-info.c:62
+msgid "symlink"
+msgstr "симболичка врска"
 
-#: ../monitor/hal/hal-utils.c:55 ../monitor/gphoto2/hal-utils.c:55
-msgid "Blank HD DVD-RW Disc"
-msgstr "Празен HD DVD-RW диск"
+#: ../programs/gvfs-info.c:65
+msgid "special"
+msgstr "специјална"
 
-#: ../monitor/hal/hal-utils.c:56 ../monitor/gphoto2/hal-utils.c:56
-msgid "MO Disc"
-msgstr "MO диск"
+#: ../programs/gvfs-info.c:68
+msgid "shortcut"
+msgstr "кратенка"
 
-#: ../monitor/hal/hal-utils.c:56 ../monitor/gphoto2/hal-utils.c:56
-msgid "Blank MO Disc"
-msgstr "Празен MO диск"
+#: ../programs/gvfs-info.c:71
+#| msgid "Not a mountable file"
+msgid "mountable"
+msgstr "монтирачки"
 
-#: ../monitor/hal/hal-utils.c:57 ../monitor/gphoto2/hal-utils.c:57
-msgid "Disc"
-msgstr "Диск"
+#: ../programs/gvfs-info.c:109
+#, c-format
+msgid "attributes:\n"
+msgstr "атрибути:\n"
 
-#: ../monitor/hal/hal-utils.c:57 ../monitor/gphoto2/hal-utils.c:57
-msgid "Blank Disc"
-msgstr "Празен диск"
+#: ../programs/gvfs-info.c:155
+#, c-format
+msgid "display name: %s\n"
+msgstr "име за приказ: %s\n"
 
-#. Translators: the first %s is the program name, the second one
-#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:57
+#: ../programs/gvfs-info.c:159
 #, c-format
-msgid "%s: %s: error opening file: %s\n"
-msgstr "%s: %s: грешка во отворањето на датотеката: %s\n"
+msgid "edit name: %s\n"
+msgstr "уреди го името: %s\n"
 
-#. Translators: the first %s is the program name, the
-#. second one is the URI of the file.
-#: ../programs/gvfs-cat.c:80
+#: ../programs/gvfs-info.c:165
 #, c-format
-msgid "%s: %s, error writing to stdout"
-msgstr "%s: %s, грешка, ја запишувам во stdout"
+msgid "name: %s\n"
+msgstr "име: %s\n"
 
-#. Translators: the first %s is the program name, the second one
-#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:92
+#: ../programs/gvfs-info.c:172
 #, c-format
-msgid "%s: %s: error reading: %s\n"
-msgstr "%s: %s: грешка во читањето: %s\n"
+msgid "type: %s\n"
+msgstr "тип: %s\n"
 
-#. Translators: the first %s is the program name, the second one
-#. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-cat.c:110
+#: ../programs/gvfs-info.c:178
 #, c-format
-msgid "%s: %s:error closing: %s\n"
-msgstr "%s: %s: грешка во затворањето: %s\n"
+msgid "size: "
+msgstr "големина: "
 
-#: ../programs/gvfs-cat.c:136
-msgid "LOCATION... - concatenate LOCATIONS to standard output."
-msgstr "LOCATION... - наведете LOCATIONS на стандардниот влез."
+#: ../programs/gvfs-info.c:183
+#, c-format
+msgid "hidden\n"
+msgstr "скриена\n"
 
-#. Translators: this message will appear after the usage string
-#. and before the list of options.
-#: ../programs/gvfs-cat.c:141
-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."
-msgstr ""
-"Наведете датотеки од локации и испечати ги на стандардниот излез. Работи "
-"самосо алатката cat, но со користење на gvfs локација наместообични "
-"датотеки: на пример, можете да користите smb://server/resource/file.txt како "
-"локација."
+#: ../programs/gvfs-info.c:266
+#| msgid "Error writing file"
+msgid "Copy with file"
+msgstr "Копирај со датотека"
 
-#: ../programs/gvfs-cat.c:148
-msgid ""
-"Note: just pipe through cat if you need its formatting option like -n, -T or "
-"other."
-msgstr ""
-"Забелешка: Само насочете го стрипот со цевка преку cat ако ви требаат опции "
-"за форматирање како -n, -T или други."
+#: ../programs/gvfs-info.c:270
+msgid "Keep with file when moved"
+msgstr "Зачувај со датотеката при преместување"
 
-#. Translators: the %s is the program name. This error message
-#. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:142
+#: ../programs/gvfs-info.c:307
 #, c-format
-msgid "%s: missing locations"
-msgstr "%s: недостасуваат локации"
+#| msgid "Error deleting file: %s"
+msgid "Error getting writable attributes: %s\n"
+msgstr "Грешка при добивањето на запишливите атрибути: %s\n"
+
+#: ../programs/gvfs-info.c:312
+#, c-format
+msgid "Settable attributes:\n"
+msgstr "Атрибут кој може да се постави:\n"
+
+#: ../programs/gvfs-info.c:335
+#, c-format
+msgid "Writable attribute namespaces:\n"
+msgstr "Именски простори на запишлив атрибут:\n"
+
+#: ../programs/gvfs-info.c:362
+msgid "- show info for <location>"
+msgstr "- покажи информации за <location>"
+
+#: ../programs/gvfs-ls.c:40
+#: ../programs/gvfs-tree.c:36
+msgid "Show hidden files"
+msgstr "Покажи ги скриените датотеки"
+
+#: ../programs/gvfs-ls.c:41
+msgid "Use a long listing format"
+msgstr "Користи формат на долго листање"
+
+#: ../programs/gvfs-ls.c:42
+msgid "Show completions"
+msgstr "Покажи довршувања"
+
+#: ../programs/gvfs-ls.c:164
+#: ../programs/gvfs-ls.c:171
+#: ../programs/gvfs-rename.c:69
+#, c-format
+#| msgid "Error: %s"
+msgid "Error: %s\n"
+msgstr "Грешка: %s\n"
+
+#: ../programs/gvfs-ls.c:383
+msgid "- list files at <location>"
+msgstr "- листај ги датотеките во <location>"
+
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "Справувач за барање на mime-type"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "Постави справувач за mime-type"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "- добиј/постави справувач за <mimetype>"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "Назначете или --query или --set"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "Мора да се назначи единствен mime-type.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr "Мора да се назначи mime-type, проследен со стандардниот справувач.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "Нема стандардна апликација за „%s“\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "Стандардна апликација за „%s“: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "Регистрирани апликации:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "Не успеав да вчитам информации за справувачот „%s“\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr "Не успеав да го прочитам „%s“ како стандарден справувач за „%s“: %s\n"
+
+#: ../programs/gvfs-mkdir.c:33
+#| msgid "Can't open directory"
+msgid "create parent directories"
+msgstr "креирај ги директориумите родители"
+
+#: ../programs/gvfs-mkdir.c:51
+#| msgid "Error creating directory"
+msgid "- create directories"
+msgstr "- креирај директориуми"
+
+#: ../programs/gvfs-mkdir.c:79
+#: ../programs/gvfs-mkdir.c:88
+#, c-format
+#| msgid "Error creating directory"
+msgid "Error creating directory: %s\n"
+msgstr "Грешка при креирањето на директориум: %s\n"
+
+#: ../programs/gvfs-monitor-dir.c:38
+#: ../programs/gvfs-monitor-file.c:38
+msgid "Don't send single MOVED events."
+msgstr "Не испраќај сами MOVED настани."
+
+#: ../programs/gvfs-mount.c:54
+#| msgid "Not a mountable file"
+msgid "Mount as mountable"
+msgstr "Монтирај како монтирачки"
+
+#: ../programs/gvfs-mount.c:55
+msgid "Mount volume with device file"
+msgstr "Монтирај го просторот со датотека на уредот"
+
+#: ../programs/gvfs-mount.c:56
+msgid "Unmount"
+msgstr "Одмонтирај"
+
+#: ../programs/gvfs-mount.c:57
+msgid "Unmount all mounts with the given scheme"
+msgstr "Одмонтирај ги сите монтирани со дадената шема"
+
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
+msgid "List"
+msgstr "Листај"
+
+#: ../programs/gvfs-mount.c:60
+msgid "Show extra information for List and Monitor"
+msgstr "Покажи додатни информации за листање и мониторирање"
+
+#: ../programs/gvfs-mount.c:61
+msgid "Monitor events"
+msgstr "Мониторирај ги настаните"
+
+#: ../programs/gvfs-mount.c:164
+#: ../programs/gvfs-mount.c:185
+#, c-format
+#| msgid "%s: %s: error opening location: %s\n"
+msgid "Error mounting location: %s\n"
+msgstr "Грешка при монтирањето на локацијата: %s\n"
+
+#: ../programs/gvfs-mount.c:242
+#, c-format
+#| msgid "Error connecting to daemon: %s"
+msgid "Error unmounting mount: %s\n"
+msgstr "Грешка при одмонтирањето на локацијата: %s\n"
+
+#: ../programs/gvfs-mount.c:263
+#, c-format
+#| msgid "Could not find enclosing mount"
+msgid "Error finding enclosing mount: %s\n"
+msgstr "Грешка при наоѓањето на монтирањето: %s\n"
+
+#: ../programs/gvfs-mount.c:696
+#, c-format
+#| msgid "Error moving file: %s"
+msgid "Error mounting %s: %s\n"
+msgstr "Грешка во монтирањето на %s: %s\n"
+
+#: ../programs/gvfs-mount.c:710
+#, c-format
+msgid "Mounted %s at %s\n"
+msgstr "Монтиран е %s на %s\n"
+
+#: ../programs/gvfs-mount.c:761
+#, c-format
+msgid "No volume for device file %s\n"
+msgstr "Нема простор за датотеката на уредот %s\n"
+
+#: ../programs/gvfs-mount.c:952
+#| msgid "%s: missing locations"
+msgid "- mount <location>"
+msgstr "- mount <location>"
+
+#: ../programs/gvfs-move.c:103
+msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
+msgstr "SOURCE... DEST - премести датотека/и од SOURCE во DEST"
+
+#: ../programs/gvfs-move.c:189
+#, c-format
+#| msgid "Error moving file: %s"
+msgid "Error moving file %s: %s\n"
+msgstr "Грешка при преместувањето на датотеката %s: %s\n"
+
+#: ../programs/gvfs-open.c:37
+msgid "files"
+msgstr "датотеки"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:56
+#: ../programs/gvfs-open.c:65
 #, c-format
 msgid "%s: %s: error opening location: %s\n"
 msgstr "%s: %s: грешка во отворањето на локацијата: %s\n"
 
 #. Translators: the first %s is the program name, the second one
 #. is the URI of the file, the third is the error message.
-#: ../programs/gvfs-open.c:83
+#: ../programs/gvfs-open.c:92
 #, c-format
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: грешка при лансирање на апликацијата: %s\n"
 
-#: ../programs/gvfs-open.c:113
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "FILES... - отвори FILES со регистрираната апликација."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:117
-msgid ""
-"Opens the file(s) with the default application registered to handle the type "
-"of the file."
-msgstr ""
-"Отвора датотека(и) со стандардната апликација регистрирана за справување со "
-"овој тип на датотеки."
+#: ../programs/gvfs-open.c:127
+msgid "Opens the file(s) with the default application registered to handle the type of the file."
+msgstr "Отвора датотека(и) со стандардната апликација регистрирана за справување со овој тип на датотеки."
+
+#: ../programs/gvfs-rename.c:50
+#| msgid "Error renaming file"
+msgid "- rename file"
+msgstr "- rename file"
+
+#: ../programs/gvfs-rename.c:76
+#, c-format
+msgid "Rename successful. New uri: %s\n"
+msgstr "Преименувањето е успешно. Ново uri: %s\n"
+
+#: ../programs/gvfs-rm.c:35
+#: ../programs/gvfs-trash.c:35
+msgid "ignore nonexistent files, never prompt"
+msgstr "Игнорирај ги непостоечките датотеки, никогаш не прашувај"
+
+#: ../programs/gvfs-rm.c:53
+#| msgid "Error deleting file"
+msgid "- delete files"
+msgstr "- delete files"
+
+#: ../programs/gvfs-save.c:43
+msgid "Create backup"
+msgstr "Креирај бекап"
+
+#: ../programs/gvfs-save.c:44
+msgid "Only create if not existing"
+msgstr "Креирај само ако не постои"
+
+#: ../programs/gvfs-save.c:45
+msgid "Append to end of file"
+msgstr "Додај на крајот на датотеката"
 
-#~ msgid "File unavailable"
-#~ msgstr "Датотеката е недостапна"
+#: ../programs/gvfs-save.c:46
+msgid "When creating a file, restrict access to the current user only"
+msgstr "При креирање на датотека, ограничи го пристапот само на тековниот корисник"
 
+#: ../programs/gvfs-save.c:47
+msgid "Print new etag at end"
+msgstr "Испечати нов etag на крајот"
+
+#: ../programs/gvfs-save.c:48
+msgid "The etag of the file being overwritten"
+msgstr "etag на датотеката над која се запишува"
+
+#: ../programs/gvfs-save.c:76
+#, c-format
+#| msgid "Error moving file: %s"
+msgid "Error opening file: %s\n"
+msgstr "Грешка при отворањето на датотека: %s\n"
+
+#: ../programs/gvfs-save.c:109
+#| msgid "Error renaming dir"
+msgid "Error reading stdin"
+msgstr "Грешка при читањето на stdin"
+
+#: ../programs/gvfs-save.c:122
+#, c-format
+#| msgid "%s: %s:error closing: %s\n"
+msgid "Error closing: %s\n"
+msgstr "Грешка при затворањето: %s\n"
+
+#: ../programs/gvfs-save.c:134
+#, c-format
+#| msgid "File unavailable"
+msgid "Etag not available\n"
+msgstr "Etag не е достапен\n"
+
+#: ../programs/gvfs-save.c:156
+msgid "DEST - read from standard input and save to DEST"
+msgstr "DEST - читај од стандарден влез и зачувај во DEST"
+
+#: ../programs/gvfs-set-attribute.c:36
+msgid "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]"
+msgstr "тип на атрибут [string, bytestring, boolean, uint32, int32, uint64, int64, stringv, unset]"
+
+#: ../programs/gvfs-set-attribute.c:119
+msgid " <location> <attribute> <values> - set attribute"
+msgstr " <location> <attribute> <values> - постави атрибут"
+
+#: ../programs/gvfs-set-attribute.c:137
+#, c-format
+#| msgid "No mount type specified"
+msgid "Location not specified\n"
+msgstr "Локацијата не е одредена\n"
+
+#: ../programs/gvfs-set-attribute.c:145
+#, c-format
+#| msgid "No drive specified"
+msgid "Attribute not specified\n"
+msgstr "Атрибутот не е одреден\n"
+
+#: ../programs/gvfs-set-attribute.c:154
+#, c-format
+#| msgid "No hostname specified"
+msgid "Value not specified\n"
+msgstr "Вредноста не е одредена\n"
+
+#: ../programs/gvfs-set-attribute.c:194
+#, c-format
+#| msgid "Invalid attribute info list content"
+msgid "Invalid attribute type %s\n"
+msgstr "Невалиден тип на атрибут %s\n"
+
+#: ../programs/gvfs-set-attribute.c:204
+#, c-format
+#| msgid "Error deleting file: %s"
+msgid "Error setting attribute: %s\n"
+msgstr "Грешка во поставувањето на атрибутот: %s\n"
+
+#: ../programs/gvfs-trash.c:52
+msgid "- move files to trash"
+msgstr "- премести датотеки во ѓубрето"
+
+#: ../programs/gvfs-trash.c:69
+#, c-format
+#| msgid "Error deleting file: %s"
+msgid "Error trashing file: %s\n"
+msgstr "Грешка при фрлањето на датотеката во ѓубре: %s\n"
+
+#: ../programs/gvfs-tree.c:37
+msgid "Follow symbolic links, mounts and shortcuts like directories"
+msgstr "Следи ги симболичките врски, монтирања и кратенки"
+
+#: ../programs/gvfs-tree.c:242
+msgid "- list contents of directories in a tree-like format"
+msgstr "- ги листа содржините на директориумите во стеблест формат"
+
+#~ msgid "Invalid return value from get_info"
+#~ msgstr "Вратена е невалидна вредност од get_info"
+#~ msgid "Invalid return value from query_info"
+#~ msgstr "Вратена е невалидна вредност од query_info"
+#~ msgid "Invalid return value from call"
+#~ msgstr "Вратена е невалидна вредност од call"
+#~ msgid "Invalid return value from get_filesystem_info"
+#~ msgstr "Вратена е невалидна вредност од get_filesystem_info"
+#~ msgid "Invalid return value from query_filesystem_info"
+#~ msgstr "Вратена е невалидна вредност од query_filesystem_info"
+#~ msgid "Invalid return value from monitor_dir"
+#~ msgstr "Вратена е невалидна вредност од monitor_dir"
+#~ msgid "Invalid return value from monitor_file"
+#~ msgstr "Вратена е невалидна вредност од monitor_file"
+#~ msgid "The query info operation is not supported"
+#~ msgstr "Операцијата за барање на информации не е поддржана"
+#~ msgid "Query info not supported on stream"
+#~ msgstr "Барањето не е поддржано за стримот"
+#~ msgid "dns-sd"
+#~ msgstr "dns-sd"
+#~ msgid "broken transmission"
+#~ msgstr "прекинат пренос"
+#~ msgid "Could not connect to host"
+#~ msgstr "Не можам да се врзам за хостот"
+#~ msgid "ftp on %s"
+#~ msgstr "ftp на %s"
+#~ msgid "filename too long"
+#~ msgstr "името на датотеката е преголемо"
+#~ msgid "Invalid destination filename"
+#~ msgstr "Невалидно име на дестинациска датотека"
+#~ msgid "Enter password"
+#~ msgstr "Внесете лозинка"
+#~ msgid "sftp on %s"
+#~ msgstr "sftp на %s"
+#~ msgid "%s (in trash)"
+#~ msgstr "%s (во ѓубрето)"
+#~ msgid "Can't delete trash"
+#~ msgstr "Не можам да ја избришам корпата за ѓубре"
+#~ msgid "Trash directory notification not supported"
+#~ msgstr "Не е поддржано известувањето за директориумот за ѓубре"
 #~ msgid "%.1f kB Media"
 #~ msgstr "Медиум од %.1f kB"
-
 #~ msgid "%.1f MB Media"
 #~ msgstr "Медиум од %.1f MB"
-
 #~ msgid "%.1f GB Media"
 #~ msgstr "Медиум од %.1f GB"
 
diff --git a/po/nb.po b/po/nb.po
index 4e065882..a6f51adf 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,16 +1,16 @@
-# Norwegian translation of gvfs (bokmål dialect).
+# Norwegian bokmål translation of gvfs.
 # Copyright (C) 1999-2003 Free Software Foundation, Inc.
 #
-# Kjartan Maraas <kmaraas@gnome.org>, 1999-2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 1999-2012.
 # Torstein Adolf Winterseth <kvikende@fsfe.org>, 2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs 1.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 22:57+0100\n"
-"PO-Revision-Date: 2011-12-14 22:57+0100\n"
+"POT-Creation-Date: 2012-01-16 17:46+0100\n"
+"PO-Revision-Date: 2012-01-16 17:46+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
-"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language-Team: Norwegian bokmål <i18n-nb@lister.ping.uio.no>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2475,12 +2475,27 @@ msgstr "Forvalgt program for «%s»: %s\n"
 msgid "Registered applications:\n"
 msgstr "Registrerte programmer:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "Ingen registrerte programmer\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Anbefalte programmer:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "Ingen anbefalte programmer\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Klarte ikke å laste informasjon for håndterer «%s»\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "Klarte ikke å sette «%s» som forvalgt håndterer for «%s»: %s\n"
diff --git a/po/sl.po b/po/sl.po
index 9de9a208..a20d3c61 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -2,14 +2,14 @@
 # Copyright (C) 2005-2006 Free Software Foundation, Inc.
 # This file is distributed under the same license as the gvfs package.
 #
-# Matej Urbančič <mateju@svn.gnome.org>, 2008 - 2010.
+# Matej Urbančič <mateju@svn.gnome.org>, 2008 - 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2011-12-02 17:15+0000\n"
-"PO-Revision-Date: 2011-12-08 22:12+0100\n"
+"POT-Creation-Date: 2012-01-15 01:31+0000\n"
+"PO-Revision-Date: 2012-01-15 13:10+0100\n"
 "Last-Translator: Matej Urbančič <mateju@svn.gnome.org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si@googlegroups.com>\n"
 "Language: \n"
@@ -2762,12 +2762,27 @@ msgstr "Privzet program za '%s': %s\n"
 msgid "Registered applications:\n"
 msgstr "Vpisani programi:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "Ni vpisanih programov.\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Priporočeni programi:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "Ni priporočenih programov.\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Nalaganje podrobnosti ročnika '%s' je spodletelo.\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "Določanje '%s' kot privzet ročnik za '%s' je spodletelo: %s\n"
diff --git a/po/sv.po b/po/sv.po
index c12a1e31..d809f3d8 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gvfs\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-12 19:21+0200\n"
-"PO-Revision-Date: 2011-09-12 19:31+0100\n"
+"POT-Creation-Date: 2012-01-18 09:53+0100\n"
+"PO-Revision-Date: 2012-01-18 09:55+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "Language: sv\n"
@@ -74,15 +74,15 @@ msgid "Invalid filename %s"
 msgstr "Ogiltigt filnamn %s"
 
 #: ../client/gdaemonfile.c:2256
-#: ../client/gdaemonvfs.c:1199
-#: ../client/gdaemonvfs.c:1334
-#: ../client/gdaemonvfs.c:1387
+#: ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333
+#: ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Fel vid inställning av filmetadata: %s"
 
 #: ../client/gdaemonfile.c:2257
-#: ../client/gdaemonvfs.c:1388
+#: ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "värden måste vara sträng eller lista av strängar"
 
@@ -98,7 +98,7 @@ msgstr "värden måste vara sträng eller lista av strängar"
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
 #: ../client/gdaemonfileoutputstream.c:1052
-#: ../client/gvfsdaemondbus.c:1059
+#: ../client/gvfsdaemondbus.c:1062
 #: ../daemon/gvfsbackendobexftp.c:1085
 #: ../daemon/gvfsbackendobexftp.c:1106
 #: ../daemon/gvfsbackendobexftp.c:1225
@@ -118,17 +118,17 @@ msgstr "värden måste vara sträng eller lista av strängar"
 #: ../daemon/gvfsbackendtest.c:187
 #: ../daemon/gvfschannel.c:322
 #: ../daemon/gvfsftptask.c:202
-#: ../monitor/gdu/ggdumount.c:1069
-#: ../monitor/proxy/gproxydrive.c:514
-#: ../monitor/proxy/gproxydrive.c:602
-#: ../monitor/proxy/gproxydrive.c:750
-#: ../monitor/proxy/gproxydrive.c:885
-#: ../monitor/proxy/gproxydrive.c:936
-#: ../monitor/proxy/gproxydrive.c:1060
-#: ../monitor/proxy/gproxymount.c:471
-#: ../monitor/proxy/gproxymount.c:556
-#: ../monitor/proxy/gproxyvolume.c:807
-#: ../monitor/proxy/gproxyvolume.c:884
+#: ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541
+#: ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777
+#: ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963
+#: ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488
+#: ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826
+#: ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "Åtgärden avbröts"
 
@@ -156,17 +156,17 @@ msgstr "Slut på ström"
 msgid "Seek not supported on stream"
 msgstr "Sökning stöds inte i strömmen"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Fel vid hämtning av monteringsinformation: %s"
 
-#: ../client/gdaemonvfs.c:1200
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Kan inte kontakta systembussen"
 
-#: ../client/gvfsdaemondbus.c:572
-#: ../client/gvfsdaemondbus.c:1013
+#: ../client/gvfsdaemondbus.c:575
+#: ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Fel vid anslutning till demon: %s"
@@ -246,48 +246,48 @@ msgstr "Kan inte hantera version %d av GVfsIcon-kodning"
 msgid "Malformed input data for GVfsIcon"
 msgstr "Felformaterat inmatningsdata för GVfsIcon"
 
-#: ../daemon/daemon-main.c:82
-#: ../daemon/daemon-main.c:237
+#: ../daemon/daemon-main.c:81
+#: ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "Fel vid anslutning till D-Bus: %s"
 
 #. translators: This is the default daemon's application name,
 #. * the %s is the type of the backend, like "FTP"
-#: ../daemon/daemon-main.c:97
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "Filsystemstjänst för %s"
 
-#: ../daemon/daemon-main.c:116
+#: ../daemon/daemon-main.c:115
 #: ../programs/gvfs-copy.c:90
 #: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Fel: %s"
 
-#: ../daemon/daemon-main.c:162
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Användning: %s --spawner dbus-id objektsökväg"
 
-#: ../daemon/daemon-main.c:186
-#: ../daemon/daemon-main.c:204
+#: ../daemon/daemon-main.c:185
+#: ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Användning: %s nyckel=värde nyckel=värde ..."
 
-#: ../daemon/daemon-main.c:202
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Ingen monteringstyp angiven"
 
-#: ../daemon/daemon-main.c:272
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "monteringspunkt för %s körs redan"
 
-#: ../daemon/daemon-main.c:283
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "fel vid start av monteringsdemon"
 
@@ -362,49 +362,49 @@ msgstr "Ange lösenord för afp på %s"
 msgid "Password dialog cancelled"
 msgstr "Lösenordsdialogen avbröts"
 
-#: ../daemon/gvfsbackendafc.c:212
+#: ../daemon/gvfsbackendafc.c:209
 msgid "Internal Apple File Control error"
 msgstr "Internt Apple File Control-fel"
 
-#: ../daemon/gvfsbackendafc.c:216
+#: ../daemon/gvfsbackendafc.c:213
 #: ../daemon/gvfsbackendftp.c:736
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
-#: ../daemon/gvfsbackendafc.c:220
+#: ../daemon/gvfsbackendafc.c:217
 msgid "The directory is not empty"
 msgstr "Katalogen är inte tom"
 
-#: ../daemon/gvfsbackendafc.c:224
+#: ../daemon/gvfsbackendafc.c:221
 msgid "The device did not respond"
 msgstr "Enheten svarade inte"
 
-#: ../daemon/gvfsbackendafc.c:228
+#: ../daemon/gvfsbackendafc.c:225
 msgid "The connection was interrupted"
 msgstr "Anslutningen avbröts"
 
-#: ../daemon/gvfsbackendafc.c:232
+#: ../daemon/gvfsbackendafc.c:229
 msgid "Invalid Apple File Control data received"
 msgstr "Ogiltigt Apple File Control-data togs emot"
 
-#: ../daemon/gvfsbackendafc.c:236
+#: ../daemon/gvfsbackendafc.c:233
 #, c-format
 msgid "Unhandled Apple File Control error (%d)"
 msgstr "Ohanterat Apple File Control-fel (%d)"
 
-#: ../daemon/gvfsbackendafc.c:252
+#: ../daemon/gvfsbackendafc.c:249
 msgid "Listing applications installed on device failed"
 msgstr "Listning av program installerade på enheten misslyckades"
 
-#: ../daemon/gvfsbackendafc.c:268
+#: ../daemon/gvfsbackendafc.c:265
 msgid "Accessing application icons on device failed"
 msgstr "Åtkomst till programikoner på enheten misslyckades"
 
-#: ../daemon/gvfsbackendafc.c:285
+#: ../daemon/gvfsbackendafc.c:282
 msgid "Lockdown Error: Invalid Argument"
 msgstr "Nedlåsningsfel: Ogiltigt argument"
 
-#: ../daemon/gvfsbackendafc.c:289
+#: ../daemon/gvfsbackendafc.c:286
 #: ../daemon/gvfsbackendafp.c:463
 #: ../daemon/gvfsbackendafp.c:1049
 #: ../daemon/gvfsbackendafp.c:1203
@@ -419,72 +419,72 @@ msgstr "Nedlåsningsfel: Ogiltigt argument"
 #: ../daemon/gvfsbackendafp.c:4089
 #: ../daemon/gvfsbackendsftp.c:310
 #: ../daemon/gvfsbackendsftp.c:1834
-#: ../daemon/gvfsftptask.c:400
+#: ../daemon/gvfsftptask.c:399
 msgid "Permission denied"
 msgstr "Åtkomst nekas"
 
-#: ../daemon/gvfsbackendafc.c:293
+#: ../daemon/gvfsbackendafc.c:290
 #, c-format
 msgid "Unhandled Lockdown error (%d)"
 msgstr "Ohanterat nedlåsningsfel (%d)"
 
-#: ../daemon/gvfsbackendafc.c:310
+#: ../daemon/gvfsbackendafc.c:307
 msgid "libimobiledevice Error: Invalid Argument"
 msgstr "Fel i libimobiledevice: Ogiltigt argument"
 
-#: ../daemon/gvfsbackendafc.c:314
+#: ../daemon/gvfsbackendafc.c:311
 msgid "libimobiledevice Error: No device found. Make sure usbmuxd is set up correctly."
 msgstr "Fel i libimobiledevice: Ingen enhet hittades. Försäkra dig om att usbmuxd är korrekt konfigurerad."
 
-#: ../daemon/gvfsbackendafc.c:318
+#: ../daemon/gvfsbackendafc.c:315
 #, c-format
 msgid "Unhandled libimobiledevice error (%d)"
 msgstr "Ohanterat fel i libimobiledevice (%d)"
 
-#: ../daemon/gvfsbackendafc.c:385
+#: ../daemon/gvfsbackendafc.c:382
+msgid "Try again"
+msgstr "Försök igen"
+
+#: ../daemon/gvfsbackendafc.c:382
 #: ../daemon/gvfsbackend.c:963
 #: ../monitor/gdu/ggdudrive.c:1024
-#: ../monitor/gdu/ggdumount.c:922
+#: ../monitor/gdu/ggdumount.c:926
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../daemon/gvfsbackendafc.c:385
-msgid "Try again"
-msgstr "Försök igen"
-
-#: ../daemon/gvfsbackendafc.c:403
+#: ../daemon/gvfsbackendafc.c:400
 #: ../daemon/gvfsbackendarchive.c:550
 #: ../daemon/gvfsbackendarchive.c:579
 #: ../daemon/gvfsbackenddav.c:1797
-#: ../daemon/gvfsbackendhttp.c:302
-#: ../daemon/gvfsbackendobexftp.c:861
-#: ../daemon/gvfsbackendobexftp.c:877
-#: ../daemon/gvfsbackendobexftp.c:896
+#: ../daemon/gvfsbackendhttp.c:309
+#: ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878
+#: ../daemon/gvfsbackendobexftp.c:897
 #: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Ogiltig monteringsspecifikation"
 
-#: ../daemon/gvfsbackendafc.c:409
-#: ../daemon/gvfsbackendafc.c:439
+#: ../daemon/gvfsbackendafc.c:406
+#: ../daemon/gvfsbackendafc.c:436
 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
 msgstr "Ogiltig AFC-plats: måste vara i formatet afc://uuid:portnummer"
 
-#: ../daemon/gvfsbackendafc.c:425
+#: ../daemon/gvfsbackendafc.c:422
 #, c-format
 msgid "Apple Mobile Device"
 msgstr "Mobil Apple-enhet"
 
-#: ../daemon/gvfsbackendafc.c:430
+#: ../daemon/gvfsbackendafc.c:427
 #, c-format
 msgid "Apple Mobile Device, Jailbroken"
 msgstr "Mobil Apple-enhet med jailbreak"
 
-#: ../daemon/gvfsbackendafc.c:435
+#: ../daemon/gvfsbackendafc.c:432
 #, c-format
 msgid "Documents on Apple Mobile Device"
 msgstr "Dokument på mobil Apple-enhet"
 
-#: ../daemon/gvfsbackendafc.c:493
+#: ../daemon/gvfsbackendafc.c:490
 #, c-format
 msgid "%s (jailbreak)"
 msgstr "%s (jailbreak)"
@@ -492,7 +492,7 @@ msgstr "%s (jailbreak)"
 #. translators:
 #. * This is "Documents on foo" where foo is the device name, eg.:
 #. * Documents on Alan Smithee's iPhone
-#: ../daemon/gvfsbackendafc.c:500
+#: ../daemon/gvfsbackendafc.c:497
 #: ../monitor/afc/afcvolume.c:125
 #, c-format
 msgid "Documents on %s"
@@ -503,13 +503,13 @@ msgstr "Dokument på %s"
 #. * shown in the dialog which is defined above.
 #: ../daemon/gvfsbackendafc.c:579
 #, c-format
-msgid "Device '%s' is password protected. Enter the password on the device and click 'Try again'."
-msgstr "Enheten \"%s\" är lösenordsskyddad. Ange lösenordet för enheten och klicka på \"Försök igen\"."
+msgid "The device '%s' is locked. Enter the passcode on the device and click 'Try again'."
+msgstr "Enheten \"%s\" är låst. Ange koden för enheten och klicka på \"Försök igen\"."
 
 #: ../daemon/gvfsbackendafc.c:918
 #: ../daemon/gvfsbackendarchive.c:655
 #: ../daemon/gvfsbackendcomputer.c:645
-#: ../daemon/gvfsbackendgphoto2.c:1812
+#: ../daemon/gvfsbackendgphoto2.c:1808
 #: ../daemon/gvfsbackendobexftp.c:1071
 #: ../daemon/gvfsbackendsmb.c:718
 #: ../daemon/gvfsbackendtrash.c:232
@@ -557,7 +557,7 @@ msgstr "Ogiltig söktyp"
 #: ../daemon/gvfsbackendsftp.c:1832
 #: ../daemon/gvfsbackendsftp.c:4633
 #: ../daemon/gvfsbackendsmb.c:1719
-#: ../daemon/gvfsftptask.c:392
+#: ../daemon/gvfsftptask.c:391
 msgid "Operation unsupported"
 msgstr "Åtgärden stöds inte"
 
@@ -898,9 +898,9 @@ msgstr "Kunde inte skapa temporärkatalog"
 #: ../daemon/gvfsbackendburn.c:972
 #: ../daemon/gvfsbackendburn.c:1008
 #: ../daemon/gvfsbackendftp.c:793
-#: ../daemon/gvfsbackendgphoto2.c:1207
-#: ../daemon/gvfsbackendgphoto2.c:2133
-#: ../daemon/gvfsbackendgphoto2.c:2852
+#: ../daemon/gvfsbackendgphoto2.c:1203
+#: ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848
 #: ../daemon/gvfsbackendsftp.c:1836
 #: ../daemon/gvfsbackendsftp.c:2949
 #: ../daemon/gvfsbackendsftp.c:2962
@@ -927,7 +927,7 @@ msgstr "Cd/dvd-skapare"
 #: ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990
 #: ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2926
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "Filen finns"
 
@@ -969,8 +969,8 @@ msgstr "Filen finns"
 #: ../daemon/gvfsjobunmountmountable.c:140
 #: ../daemon/gvfsjobunmountmountable.c:155
 #: ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1173
-#: ../monitor/gdu/ggdumount.c:1257
+#: ../monitor/gdu/ggdumount.c:1177
+#: ../monitor/gdu/ggdumount.c:1261
 #: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "Åtgärden stöds inte av bakänden"
@@ -989,20 +989,20 @@ msgstr "Målfilen finns"
 
 #: ../daemon/gvfsbackendburn.c:950
 #: ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2506
-#: ../daemon/gvfsbackendgphoto2.c:2715
-#: ../daemon/gvfsbackendgphoto2.c:2812
-#: ../daemon/gvfsbackendgphoto2.c:2905
+#: ../daemon/gvfsbackendgphoto2.c:2502
+#: ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808
+#: ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Stöds inte"
 
 #: ../daemon/gvfsbackend.c:962
-#: ../monitor/gdu/ggdumount.c:921
+#: ../monitor/gdu/ggdumount.c:925
 msgid "Unmount Anyway"
 msgstr "Avmontera ändå"
 
 #: ../daemon/gvfsbackend.c:965
-#: ../monitor/gdu/ggdumount.c:923
+#: ../monitor/gdu/ggdumount.c:927
 msgid ""
 "Volume is busy\n"
 "One or more applications are keeping the volume busy."
@@ -1011,22 +1011,22 @@ msgstr ""
 "Ett eller flera program håller volymen upptagen."
 
 #: ../daemon/gvfsbackendcdda.c:332
-#: ../daemon/gvfsbackendgphoto2.c:1510
+#: ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "Kan inte skapa gudev-klient"
 
 #: ../daemon/gvfsbackendcdda.c:352
-#: ../daemon/gvfsbackendgphoto2.c:1528
+#: ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Kan inte ansluta till systembussen"
 
 #: ../daemon/gvfsbackendcdda.c:363
-#: ../daemon/gvfsbackendgphoto2.c:1540
+#: ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Kan inte skapa libhal-kontext"
 
 #: ../daemon/gvfsbackendcdda.c:377
-#: ../daemon/gvfsbackendgphoto2.c:1553
+#: ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Kan inte initiera libhal"
 
@@ -1086,7 +1086,7 @@ msgid "Error seeking in stream on drive %s"
 msgstr "Fel vid sökning i ström på enheten %s"
 
 #: ../daemon/gvfsbackendcdda.c:980
-#: ../daemon/gvfsbackendgphoto2.c:1820
+#: ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Ingen sådan fil"
@@ -1178,7 +1178,7 @@ msgstr "WebDAV på %s%s"
 
 #: ../daemon/gvfsbackenddav.c:668
 #: ../daemon/gvfsbackenddav.c:1864
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP-fel: %s"
@@ -1304,15 +1304,15 @@ msgid "%s: %d: Not Supported"
 msgstr "%s: %d: Stöds inte"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:720
-#: ../daemon/gvfsbackendgphoto2.c:726
+#: ../daemon/gvfsbackendgphoto2.c:716
+#: ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "Digitalkamera (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:949
+#: ../daemon/gvfsbackendgphoto2.c:945
 #: ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
@@ -1321,178 +1321,178 @@ msgstr "%s-kamera"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:952
+#: ../daemon/gvfsbackendgphoto2.c:948
 #: ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s-ljudspelare"
 
-#: ../daemon/gvfsbackendgphoto2.c:961
+#: ../daemon/gvfsbackendgphoto2.c:957
 #: ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../daemon/gvfsbackendgphoto2.c:963
+#: ../daemon/gvfsbackendgphoto2.c:959
 #: ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Ljudspelare"
 
-#: ../daemon/gvfsbackendgphoto2.c:1569
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Ingen enhet angiven"
 
-#: ../daemon/gvfsbackendgphoto2.c:1590
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "Kan inte skapa gphoto2-kontext"
 
-#: ../daemon/gvfsbackendgphoto2.c:1600
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Fel vid skapande av kamera"
 
-#: ../daemon/gvfsbackendgphoto2.c:1613
-#: ../daemon/gvfsbackendgphoto2.c:1623
+#: ../daemon/gvfsbackendgphoto2.c:1609
+#: ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Fel vid inläsning av enhetsinformation"
 
-#: ../daemon/gvfsbackendgphoto2.c:1635
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Fel vid uppslag av enhetsinformation"
 
-#: ../daemon/gvfsbackendgphoto2.c:1645
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Fel vid hämtning av enhetsinformation"
 
-#: ../daemon/gvfsbackendgphoto2.c:1658
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Fel vid konfiguration av port för kamerakommunikation"
 
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Fel vid initiering av kamera"
 
 #. 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:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2-montering på %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:1766
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Ingen kamera angiven"
 
-#: ../daemon/gvfsbackendgphoto2.c:1828
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Fel vid skapande av filobjekt"
 
-#: ../daemon/gvfsbackendgphoto2.c:1843
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Fel vid hämtning av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:1853
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Fel vid datahämtning från fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:1911
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Felformaterad ikonidentifierare \"%s\""
 
-#: ../daemon/gvfsbackendgphoto2.c:1987
-#: ../daemon/gvfsbackendgphoto2.c:3176
+#: ../daemon/gvfsbackendgphoto2.c:1983
+#: ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Fel vid sökning i ström på kameran %s"
 
-#: ../daemon/gvfsbackendgphoto2.c:2127
+#: ../daemon/gvfsbackendgphoto2.c:2123
 #: ../daemon/gvfsbackendsftp.c:2952
 #: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Inte en katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2160
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Misslyckades med att få tag på mapplista"
 
-#: ../daemon/gvfsbackendgphoto2.c:2226
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Misslyckades med att få tag på fillista"
 
-#: ../daemon/gvfsbackendgphoto2.c:2518
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Fel vid skapande av katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2727
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "Namnet finns redan"
 
-#: ../daemon/gvfsbackendgphoto2.c:2738
-#: ../daemon/gvfsbackendgphoto2.c:3367
+#: ../daemon/gvfsbackendgphoto2.c:2734
+#: ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "Nytt namn är för långt"
 
-#: ../daemon/gvfsbackendgphoto2.c:2748
-#: ../daemon/gvfsbackendgphoto2.c:3378
+#: ../daemon/gvfsbackendgphoto2.c:2744
+#: ../daemon/gvfsbackendgphoto2.c:3374
 msgid "Error renaming directory"
 msgstr "Fel vid namnbyte av katalogen"
 
-#: ../daemon/gvfsbackendgphoto2.c:2761
-#: ../daemon/gvfsbackendgphoto2.c:3391
+#: ../daemon/gvfsbackendgphoto2.c:2757
+#: ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Fel vid namnbyte av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2825
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Katalogen \"%s\" är inte tom"
 
-#: ../daemon/gvfsbackendgphoto2.c:2836
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Fel vid borttagning av katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2862
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Fel vid borttagning av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Kan inte skriva till katalog"
 
-#: ../daemon/gvfsbackendgphoto2.c:2962
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Kan inte allokera ny fil att lägga till i"
 
-#: ../daemon/gvfsbackendgphoto2.c:2977
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Kan inte läsa fil att lägga till i"
 
-#: ../daemon/gvfsbackendgphoto2.c:2988
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Kan inte få tag på data för fil att lägga till i"
 
-#: ../daemon/gvfsbackendgphoto2.c:3275
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Fel vid skrivning av fil"
 
-#: ../daemon/gvfsbackendgphoto2.c:3323
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Stöds inte (inte samma katalog)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3335
+#: ../daemon/gvfsbackendgphoto2.c:3331
 msgid "Not supported (the source is a directory, the destination is a directory too)"
 msgstr "Stöds inte (källan är en katalog, målet är också en katalog)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3343
+#: ../daemon/gvfsbackendgphoto2.c:3339
 msgid "Not supported (the source is a directory, but the destination is an existing file)"
 msgstr "Stöds inte (källan är en katalog, men målet är en befintlig fil)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3355
+#: ../daemon/gvfsbackendgphoto2.c:3351
 msgid "Not supported (the source is a file, but the destination is a directory)"
 msgstr "Stöds inte (källan är en fil, men målet är en katalog)"
 
-#: ../daemon/gvfsbackendhttp.c:244
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP-klientfel: %s"
@@ -1519,14 +1519,14 @@ msgstr "Övervakare för nätverksplatser"
 #. 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:681
+#: ../daemon/gvfsbackendobexftp.c:682
 #: ../daemon/gvfsbackendsmb.c:554
 #: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%s på %s"
 
-#: ../daemon/gvfsbackendobexftp.c:890
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "USB-stöd saknas. Kontakta din programtillverkare"
 
@@ -1815,7 +1815,7 @@ msgstr "Objekt i papperskorgen kan inte ändras"
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Ogiltig typ av bakände"
 
@@ -1830,8 +1830,8 @@ msgstr "Oväntat slut på strömmen"
 
 #: ../daemon/gvfsftpconnection.c:196
 #: ../daemon/gvfsftpconnection.c:209
-#: ../daemon/gvfsftptask.c:412
-#: ../daemon/gvfsftptask.c:840
+#: ../daemon/gvfsftptask.c:411
+#: ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Ogiltigt svar"
 
@@ -1847,44 +1847,44 @@ msgstr "Misslyckades med att skapa aktiv FTP-anslutning."
 msgid "Filename contains invalid characters."
 msgstr "Filnamnet innehåller ogiltiga tecken."
 
-#: ../daemon/gvfsftptask.c:262
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP-servern är upptagen. Försök igen senare"
 
-#: ../daemon/gvfsftptask.c:356
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "Konton stöds inte"
 
-#: ../daemon/gvfsftptask.c:360
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "Värden stängde anslutningen"
 
-#: ../daemon/gvfsftptask.c:364
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr "Kan inte öppna dataanslutning. Kanske förhindrar din brandvägg detta?"
 
-#: ../daemon/gvfsftptask.c:368
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Dataanslutning stängd"
 
-#: ../daemon/gvfsftptask.c:375
-#: ../daemon/gvfsftptask.c:379
+#: ../daemon/gvfsftptask.c:374
+#: ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "Åtgärden misslyckades"
 
-#: ../daemon/gvfsftptask.c:384
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Inget ledigt utrymme på servern"
 
-#: ../daemon/gvfsftptask.c:396
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Nätverksprotokollet stöds inte"
 
-#: ../daemon/gvfsftptask.c:404
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Sidtypen är okänd"
 
-#: ../daemon/gvfsftptask.c:408
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Ogiltigt filnamn"
 
@@ -1909,23 +1909,23 @@ msgstr "Ersätt gammal demon."
 msgid "Don't start fuse."
 msgstr "Starta inte fuse."
 
-#: ../daemon/main.c:62
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS-demon"
 
-#: ../daemon/main.c:65
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "Huvuddemon för GVFS"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:80
+#: ../daemon/main.c:78
 #: ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:82
+#: ../daemon/main.c:80
 #: ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163
 #: ../programs/gvfs-cat.c:176
@@ -1956,7 +1956,7 @@ msgid "Automount failed: %s"
 msgstr "Automatisk montering misslyckades: %s"
 
 #: ../daemon/mount.c:825
-#: ../daemon/mount.c:902
+#: ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Angiven plats är inte monterad"
 
@@ -1964,11 +1964,11 @@ msgstr "Angiven plats är inte monterad"
 msgid "The specified location is not supported"
 msgstr "Angiven plats stöds inte"
 
-#: ../daemon/mount.c:1044
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "Platsen är redan monterad"
 
-#: ../daemon/mount.c:1052
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "Platsen är inte monteringsbar"
 
@@ -2042,15 +2042,15 @@ msgstr ""
 msgid "Start Anyway"
 msgstr "Starta ändå"
 
-#: ../monitor/gdu/ggdumount.c:856
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Ett eller flera program förhindrar avmonteringsåtgärden."
 
-#: ../monitor/gdu/ggdumount.c:984
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "Kan inte få LUKS-klartextslav"
 
-#: ../monitor/gdu/ggdumount.c:1006
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Kan inte få LUKS-klartextslav från sökvägen \"%s\""
@@ -2762,12 +2762,27 @@ msgstr "Standardprogram för \"%s\": %s\n"
 msgid "Registered applications:\n"
 msgstr "Registrerade program:\n"
 
-#: ../programs/gvfs-mime.c:152
+#: ../programs/gvfs-mime.c:134
+#, c-format
+msgid "No registered applications\n"
+msgstr "Inga registrerade program\n"
+
+#: ../programs/gvfs-mime.c:145
+#, c-format
+msgid "Recommended applications:\n"
+msgstr "Rekommenderade program:\n"
+
+#: ../programs/gvfs-mime.c:147
+#, c-format
+msgid "No recommended applications\n"
+msgstr "Inga rekommenderade program\n"
+
+#: ../programs/gvfs-mime.c:167
 #, c-format
 msgid "Failed to load info for handler '%s'\n"
 msgstr "Misslyckades med att läsa in information för hanteraren \"%s\"\n"
 
-#: ../programs/gvfs-mime.c:158
+#: ../programs/gvfs-mime.c:173
 #, c-format
 msgid "Failed to set '%s' as the default handler for '%s': %s\n"
 msgstr "Misslyckades med att ställa in \"%s\" som standardhanterare för \"%s\": %s\n"
@@ -2836,22 +2851,22 @@ msgstr "Fel vid avmontering av montering: %s\n"
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Kunde inte hitta inneslutade montering: %s\n"
 
-#: ../programs/gvfs-mount.c:683
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "Fel vid montering av %s: %s\n"
 
-#: ../programs/gvfs-mount.c:697
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "Monterade %s på %s\n"
 
-#: ../programs/gvfs-mount.c:748
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Ingen volym för enhetsfilen %s\n"
 
-#: ../programs/gvfs-mount.c:939
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- montera <plats>"
 
@@ -3009,56 +3024,82 @@ msgstr "- lista innehållet i kataloger i ett trädliknande format"
 
 #~ msgid "ftp on %s"
 #~ msgstr "ftp på %s"
+
 #~ msgid "Error renaming dir"
 #~ msgstr "Fel vid namnbyte av katalog"
+
 #~ msgid "sftp on %s"
 #~ msgstr "sftp på %s"
+
 #~ msgid "Unhandled Inst proxy error (%d)"
 #~ msgstr "Ohanterat Inst proxy-fel (%d)"
+
 #~ msgid "Unhandled SBServices proxy error (%d)"
 #~ msgstr "Ohanterat  SBServices proxy-fel (%d)"
+
 #~ msgid "Service %d on Apple Mobile Device"
 #~ msgstr "Tjänst %d på mobil Apple-enhet"
+
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
+
 #~ msgid "Enter password"
 #~ msgstr "Ange lösenord"
+
 #~ msgid "- output files at <location>"
 #~ msgstr "- skriv filer till <plats>"
+
 #~ msgid "Invalid return value from get_info"
 #~ msgstr "Ogiltigt svarsvärde från get_info"
+
 #~ msgid "Invalid return value from query_info"
 #~ msgstr "Ogiltigt svarsvärde från query_info"
+
 #~ msgid "Invalid return value from call"
 #~ msgstr "Ogiltigt svarsvärde från call"
+
 #~ msgid "Invalid return value from get_filesystem_info"
 #~ msgstr "Ogiltigt svarsvärde från get_filesystem_info"
+
 #~ msgid "Invalid return value from query_filesystem_info"
 #~ msgstr "Ogiltigt svarsvärde från query_filesystem_info"
+
 #~ msgid "Invalid return value from monitor_dir"
 #~ msgstr "Ogiltigt svarsvärde från monitor_dir"
+
 #~ msgid "Invalid return value from monitor_file"
 #~ msgstr "Ogiltigt svarsvärde från monitor_file"
+
 #~ msgid "Invalid return value from open_icon_for_read"
 #~ msgstr "Ogiltigt svarsvärde från open_icon_for_read"
+
 #~ msgid "The query info operation is not supported"
 #~ msgstr "Frågeåtgärden stöds inte"
+
 #~ msgid "Query info not supported on stream"
 #~ msgstr "Informationsbegäran stöds inte i strömmen"
+
 #~ msgid "broken transmission"
 #~ msgstr "avbruten överföring"
+
 #~ msgid "Could not connect to host"
 #~ msgstr "Kunde inte ansluta till värd"
+
 #~ msgid "filename too long"
 #~ msgstr "filnamnet är för långt"
+
 #~ msgid "Invalid destination filename"
 #~ msgstr "Ogiltigt målfilnamn"
+
 #~ msgid "Can't delete trash"
 #~ msgstr "Kan inte ta bort papperskorg"
+
 #~ msgid "%s (in trash)"
 #~ msgstr "%s (i papperskorg)"
+
 #~ msgid "Trash directory notification not supported"
 #~ msgstr "Notifiering för papperskorgskatalog stöds inte"
+
 #~ msgid "dns-sd"
 #~ msgstr "dns-sd"
 
@@ -3069,72 +3110,96 @@ msgstr "- lista innehållet i kataloger i ett trädliknande format"
 #, fuzzy
 #~ msgid "Error getting port info from port info list"
 #~ msgstr "Fel vid hämtning av monteringsinformation: %s"
+
 #~ msgid "File system is busy: %d open files"
 #~ msgstr "Filsystemet är upptaget: %d öppnade filer"
+
 #~ msgid "Error listing folders"
 #~ msgstr "Fel vid mapplistning"
+
 #~ msgid "Error listing files in folder"
 #~ msgstr "Fel vid fillistning i mapp"
+
 #~ msgid "%.1f kB Media"
 #~ msgstr "%.1f kB-media"
+
 #~ msgid "%.1f MB Media"
 #~ msgstr "%.1f MB-media"
+
 #~ msgid "%.1f GB Media"
 #~ msgstr "%.1f GB-media"
+
 #~ msgid "Invalid reply from server"
 #~ msgstr "Ogiltigt svar från server"
+
 #~ msgid "Operation cancelled"
 #~ msgstr "Åtgärden avbröts"
+
 #~ msgid "FTP on %s:%u"
 #~ msgstr "FTP på %s:%u"
+
 #~ msgid "Audio Disc on %s"
 #~ msgstr "Ljudskiva på %s"
+
 #~ msgid "CD Burner"
 #~ msgstr "Cd-brännare"
+
 #~ msgid "Can't enumerate non-directory"
 #~ msgstr "Kan inte numrera icke-katalog"
+
 #~ msgid "Can't find mount for mounted volume"
 #~ msgstr "Kan inte hitta montering för monterad volym"
+
 #~ msgid "Failed to initialize smb context"
 #~ msgstr "Misslyckades med att initiera smb-kontext"
+
 #~ msgid ""
 #~ "A list of default mount options for volumes formatted with the iso9660 "
 #~ "file system."
 #~ msgstr ""
 #~ "En lista på standardmonteringsalternativ för volymer som är formaterade "
 #~ "med iso9660-filsystemet."
+
 #~ msgid ""
 #~ "A list of default mount options for volumes formatted with the ntfs file "
 #~ "system using ntfs-3g."
 #~ msgstr ""
 #~ "En lista på standardmonteringsalternativ för volymer som är formaterade "
 #~ "med ntfs-filsystemet med ntfs-3g."
+
 #~ msgid ""
 #~ "A list of default mount options for volumes formatted with the ntfs file "
 #~ "system."
 #~ msgstr ""
 #~ "En lista på standardmonteringsalternativ för volymer som är formaterade "
 #~ "med ntfs-filsystemet."
+
 #~ msgid ""
 #~ "A list of default mount options for volumes formatted with the udf file "
 #~ "system."
 #~ msgstr ""
 #~ "En lista på standardmonteringsalternativ för volymer som är formaterade "
 #~ "med udf-filsystemet."
+
 #~ msgid ""
 #~ "A list of default mount options for volumes formatted with the vfat file "
 #~ "system."
 #~ msgstr ""
 #~ "En lista på standardmonteringsalternativ för volymer som är formaterade "
 #~ "med vfat-filsystemet."
+
 #~ msgid "Default mount options for iso9660 fs"
 #~ msgstr "Standardmonteringsalternativ för iso9960-filsystem"
+
 #~ msgid "Default mount options for ntfs-3g fs"
 #~ msgstr "Standardmonteringsalternativ för ntfs-3g-filsystem"
+
 #~ msgid "Default mount options for udf fs"
 #~ msgstr "Standardmonteringsalternativ för udf-filsystem"
+
 #~ msgid "Default mount options for vfat fs"
 #~ msgstr "Standardmonteringsalternativ för vfat-filsystem"
+
 #~ msgid ""
 #~ "The name of the file system driver to use by default when 'ntfs' is "
 #~ "detected. This is useful for configuring the system to use the 'ntfs-3g' "
@@ -3148,163 +3213,232 @@ msgstr "- lista innehållet i kataloger i ett trädliknande format"
 #~ "standard. Användaren kan fortfarande välja att använda "
 #~ "filsystemsdrivrutinen \"ntfs\" genom att åsidosätta den för varje volym "
 #~ "eller på kommandoraden."
+
 #~ msgid "When 'ntfs' is detected, what file system driver to use by default"
 #~ msgstr ""
 #~ "När \"ntfs\" identifieras, vilken filsystemdrivrutin ska användas som "
 #~ "standard"
+
 #~ msgid "_Username:"
 #~ msgstr "_Användarnamn:"
+
 #~ msgid "_Domain:"
 #~ msgstr "_Domän:"
+
 #~ msgid "_Password:"
 #~ msgstr "_Lösenord:"
+
 #~ msgid "Con_firm password:"
 #~ msgstr "_Bekräfta lösenord:"
+
 #~ msgid "Password quality:"
 #~ msgstr "Lösenordskvalitet:"
+
 #~ msgid "Co_nnect"
 #~ msgstr "Ans_lut"
+
 #~ msgid "Connect _anonymously"
 #~ msgstr "Anslut _anonymt"
+
 #~ msgid "Connect as u_ser:"
 #~ msgstr "Anslut som an_vändare:"
+
 #~ msgid "_Forget password immediately"
 #~ msgstr "_Glöm lösenordet omedelbart"
+
 #~ msgid "_Remember password until you logout"
 #~ msgstr "Kom ihåg lösenordet tills du loggar _ut"
+
 #~ msgid "_Remember forever"
 #~ msgstr "Kom ihåg _för alltid"
+
 #~ msgid "You are not privileged to eject the volume '%s'."
 #~ msgstr "Du har inte rättighet att mata ut volymen \"%s\"."
+
 #~ msgid "You are not privileged to eject this volume."
 #~ msgstr "Du har inte rättighet att mata ut denna volym."
+
 #~ msgid "An application is preventing the volume '%s' from being ejected."
 #~ msgstr "Ett program förhindrar att volymen \"%s\" kan matas ut."
+
 #~ msgid "An application is preventing the volume from being ejected."
 #~ msgstr "Ett program förhindrar att volymen kan matas ut."
+
 #~ msgid "Cannot eject the volume '%s'."
 #~ msgstr "Kan inte mata ut volymen \"%s\"."
+
 #~ msgid "Cannot eject the volume."
 #~ msgstr "Kan inte mata ut volymen."
+
 #~ msgid "You are not privileged to unmount the volume '%s'."
 #~ msgstr "Du har inte rättighet att avmontera volymen \"%s\"."
+
 #~ msgid "You are not privileged to unmount this volume."
 #~ msgstr "Du har inte rättighet att avmontera denna volym."
+
 #~ msgid "An application is preventing the volume '%s' from being unmounted."
 #~ msgstr "Ett program förhindrar att volymen \"%s\" kan avmonteras."
+
 #~ msgid "An application is preventing the volume from being unmounted."
 #~ msgstr "Ett program förhindrar att volymen kan avmonteras."
+
 #~ msgid "The volume '%s' is not mounted."
 #~ msgstr "Volymen \"%s\" är inte monterad."
+
 #~ msgid "The volume '%s' was probably mounted manually on the command line."
 #~ msgstr "Volymen \"%s\" blev antagligen monterad manuellt på kommandoraden."
+
 #~ msgid "The volume was probably mounted manually on the command line."
 #~ msgstr "Volymen blev antagligen monterad manuellt på kommandoraden."
+
 #~ msgid "Error <i>%s</i>."
 #~ msgstr "Fel <i>%s</i>."
+
 #~ msgid "_Details"
 #~ msgstr "_Detaljer"
+
 #~ msgid "You are not privileged to mount the volume '%s'."
 #~ msgstr "Du har inte rättighet att montera volymen \"%s\"."
+
 #~ msgid "You are not privileged to mount this volume."
 #~ msgstr "Du har inte rättighet att montera denna volym."
+
 #~ msgid "Invalid mount option when attempting to mount the volume '%s'."
 #~ msgstr "Ogiltig monteringsflagg vid försök att montera volymen \"%s\"."
+
 #~ msgid "Invalid mount option when attempting to mount the volume."
 #~ msgstr "Ogiltig monteringsflagg vid försök att montera volymen."
+
 #~ msgid ""
 #~ "The volume '%s' uses the <i>%s</i> file system which is not supported by "
 #~ "your system."
 #~ msgstr ""
 #~ "Volymen \"%s\" använder filsystemet <i>%s</i> som inte stöds av ditt "
 #~ "system."
+
 #~ msgid ""
 #~ "The volume uses the <i>%s</i> file system which is not supported by your "
 #~ "system."
 #~ msgstr ""
 #~ "Volymen använder filsystemet <i>%s</i> som inte stöds av ditt system."
+
 #~ msgid "Device %s is in /etc/fstab with mount point \"%s\"\n"
 #~ msgstr "Enheten %s finns i /etc/fstab med monteringspunkten \"%s\"\n"
+
 #~ msgid "Mounted %s at \"%s\" (using /etc/fstab)\n"
 #~ msgstr "Monterade %s på \"%s\" (enligt /etc/fstab)\n"
+
 #~ msgid "Writing data to device"
 #~ msgstr "Skriver data till enhet"
+
 #~ msgid ""
 #~ "There is data that needs to be written to the device %s before it can be "
 #~ "removed. Please do not remove the media or disconnect the drive."
 #~ msgstr ""
 #~ "Det finns data som behöver skrivas till enheten %s innan den kan kopplas "
 #~ "från. Ta inte bort mediet eller koppla från enheten."
+
 #~ msgid "Device is now safe to remove"
 #~ msgstr "Enheten kan nu kopplas från"
+
 #~ msgid "Unmounted %s (using /etc/fstab)\n"
 #~ msgstr "Avmonterade %s (enligt /etc/fstab)\n"
+
 #~ msgid "Ejected %s (using /etc/fstab).\n"
 #~ msgstr "Matade ut %s (enligt /etc/fstab).\n"
+
 #~ msgid ""
 #~ "The storage device %s contains encrypted data. Enter a password to unlock."
 #~ msgstr ""
 #~ "Lagringsenheten %s innehåller krypterat data. Ange ett lösenord för att "
 #~ "låsa upp."
+
 #~ msgid "Setup clear-text device for %s.\n"
 #~ msgstr "Konfigurera klartextenhet för %s.\n"
+
 #~ msgid "Teared down clear-text device for %s.\n"
 #~ msgstr "Nedbruten klartextenhet för %s.\n"
+
 #~ msgid "Clear text device is %s. Mounting.\n"
 #~ msgstr "Klartextenheten är %s. Monterar.\n"
+
 #~ msgid "X display not available - using text-based operation.\n"
 #~ msgstr "X-display finns inte tillgänglig - använder textbaserad åtgärd.\n"
+
 #~ msgid "Resolved pseudonym \"%s\" -> %s\n"
 #~ msgstr "Slog upp pseudonymen \"%s\" -> %s\n"
+
 #~ msgid "Cannot resolve pseudonym \"%s\" to a volume\n"
 #~ msgstr "Kan inte slå upp pseudonymen \"%s\" till en volym\n"
+
 #~ msgid "Use --hal-udi, --device or --pseudonym to specify volume\n"
 #~ msgstr "Använd --hal-udi, --device eller --pseudonym för att ange volym\n"
+
 #~ msgid "Given device '%s' is not a volume or a drive."
 #~ msgstr "Angivna enheten \"%s\" är inte en volym eller en enhet."
+
 #~ msgid "Cannot unmount and eject simultaneously"
 #~ msgstr "Kan inte avmontera och mata ut samtidigt"
+
 #~ msgid "Crypto volume '%s' is already setup with clear volume '%s'"
 #~ msgstr ""
 #~ "Kryptovolymen \"%s\" är redan konfigurerad med en klartextvolym \"%s\""
+
 #~ msgid "Bad crypto password"
 #~ msgstr "Felaktigt kryptolösenord"
+
 #~ msgid "Bailing out..."
 #~ msgstr "Avslutar..."
+
 #~ msgid "<b>Connection:</b>"
 #~ msgstr "<b>Anslutning:</b>"
+
 #~ msgid "<b>External:</b>"
 #~ msgstr "<b>Extern:</b>"
+
 #~ msgid "<b>Firmware:</b>"
 #~ msgstr "<b>Fast programvara:</b>"
+
 #~ msgid "<b>Label:</b>"
 #~ msgstr "<b>Etikett:</b>"
+
 #~ msgid "<b>Media:</b>"
 #~ msgstr "<b>Media:</b>"
+
 #~ msgid "<b>Model:</b>"
 #~ msgstr "<b>Modell:</b>"
+
 #~ msgid "<b>Mount Options:</b>"
 #~ msgstr "<b>Monteringsalternativ:</b>"
+
 #~ msgid "<b>Mount Point:</b>"
 #~ msgstr "<b>Monteringspunkt:</b>"
+
 #~ msgid "<b>Removable:</b>"
 #~ msgstr "<b>Flyttbar:</b>"
+
 #~ msgid "<b>Serial:</b>"
 #~ msgstr "<b>Serienummer:</b>"
+
 #~ msgid "<b>Settings</b>"
 #~ msgstr "<b>Inställningar</b>"
+
 #~ msgid "<b>Size:</b>"
 #~ msgstr "<b>Storlek:</b>"
+
 #~ msgid "<b>UUID:</b>"
 #~ msgstr "<b>UUID:</b>"
+
 #~ msgid "<b>Vendor:</b>"
 #~ msgstr "<b>Tillverkare:</b>"
+
 #~ msgid ""
 #~ "<small><i>Changes in settings will not take effect until the\n"
 #~ "volume is remounted.</i></small>"
 #~ msgstr ""
 #~ "<small><i>Ändringar i inställningarna kommer att börja gälla\n"
 #~ "först nästa gång du monterar volymen.</i></small>"
+
 #~ msgid ""
 #~ "<small><i>Settings for a drive affects all volumes inserted in\n"
 #~ "the drive. This can be overriden for individual \n"
@@ -3313,20 +3447,27 @@ msgstr "- lista innehållet i kataloger i ett trädliknande format"
 #~ "<small><i>Inställningar för en enhet påverkar alla volymer som\n"
 #~ "är inmatade i enheten. Detta kan åsidosättas för individuella \n"
 #~ " volymer under fliken \"Volym\".</i></small>"
+
 #~ msgid "Removable Hard Disk"
 #~ msgstr "Flyttbar hårddisk"
+
 #~ msgid "Hard Disk"
 #~ msgstr "Hårddisk"
+
 #~ msgid "Blank DVD-R Disc"
 #~ msgstr "Tom dvd-r-skiva"
+
 #~ msgid "DVD-R Disc"
 #~ msgstr "Dvd-r-skiva"
+
 #~ msgid "Blank DVD+R Dual Layer Disc"
 #~ msgstr "Tom dvd+r-skiva (dubbla lager)"
+
 #~ msgid "DVD+R Dual Layer Disc"
 #~ msgstr "Dvd+r-skiva (dubbla lager)"
+
 #~ msgid "Blank BD-RE Disc"
 #~ msgstr "Tom bd-re-skiva"
+
 #~ msgid "BD-RE Disc"
 #~ msgstr "Bd-re-skiva"
-
diff --git a/po/tr.po b/po/tr.po
index 8bdeddb6..b9ff3d40 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,91 +4,77 @@
 #
 #
 # Baris Cicek <baris@teamforce.name.tr>, 2008, 2009.
+# Muhammet Kara <muhammet.k@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: gvfs\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-30 07:55+0300\n"
-"PO-Revision-Date: 2009-08-30 07:54+0300\n"
-"Last-Translator: Baris Cicek <baris@teamforce.name.tr>\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=gvfs&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2011-12-01 20:15+0000\n"
+"PO-Revision-Date: 2011-12-24 16:31+0200\n"
+"Last-Translator: Muhammet Kara <muhammet.k@gmail.com>\n"
 "Language-Team: Turkish <gnome-turk@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms:  nplurals=1; plural=0;\n"
+"Language: tr\n"
+"X-Generator: Lokalize 1.2\n"
 
-#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2373
+#: ../client/gdaemonfile.c:498 ../client/gdaemonfile.c:2400
 msgid "Operation not supported, files on different mounts"
 msgstr "Dosyalar farklı bağlantılar üzerinde olduğundan işlem desteklenmiyor"
 
-#: ../client/gdaemonfile.c:867
-msgid "Invalid return value from get_info"
-msgstr "get_info geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfile.c:901 ../client/gdaemonfile.c:1879
-msgid "Invalid return value from query_info"
-msgstr "query_info geçersiz bir değer döndürdü"
+#. Translators: %s is the name of a programming function
+#: ../client/gdaemonfile.c:876 ../client/gdaemonfile.c:911
+#: ../client/gdaemonfile.c:1027 ../client/gdaemonfile.c:1106
+#: ../client/gdaemonfile.c:1169 ../client/gdaemonfile.c:1232
+#: ../client/gdaemonfile.c:1298 ../client/gdaemonfile.c:1361
+#: ../client/gdaemonfile.c:1378 ../client/gdaemonfile.c:1867
+#: ../client/gdaemonfile.c:1897 ../client/gdaemonfile.c:2058
+#: ../client/gdaemonfile.c:2560 ../client/gdaemonfile.c:2609
+#: ../client/gdaemonfile.c:2674 ../client/gdaemonfile.c:2759
+#: ../client/gdaemonfile.c:2835 ../client/gdaemonfile.c:3024
+#: ../client/gdaemonfile.c:3105 ../client/gvfsiconloadable.c:145
+#: ../client/gvfsiconloadable.c:374
+#, c-format
+#| msgid "Invalid return value from open"
+msgid "Invalid return value from %s"
+msgstr "%s fonksiyonundan geçersiz geri dönüş değeri"
 
-#: ../client/gdaemonfile.c:984 ../client/gvfsiconloadable.c:339
+#: ../client/gdaemonfile.c:994 ../client/gvfsiconloadable.c:339
 msgid "Couldn't get stream file descriptor"
 msgstr "Akış dosyası belirteci alınamadı"
 
-#: ../client/gdaemonfile.c:1016 ../client/gdaemonfile.c:1095
-#: ../client/gdaemonfile.c:1158 ../client/gdaemonfile.c:1221
-#: ../client/gdaemonfile.c:1287 ../client/gdaemonfile.c:2646
-#: ../client/gdaemonfile.c:2730 ../client/gdaemonfile.c:2993
-#: ../client/gvfsiconloadable.c:374
-msgid "Invalid return value from open"
-msgstr "open geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfile.c:1105 ../client/gdaemonfile.c:1168
-#: ../client/gdaemonfile.c:1231 ../client/gdaemonfile.c:1297
-#: ../client/gdaemonfile.c:2612 ../client/gvfsiconloadable.c:155
+#: ../client/gdaemonfile.c:1116 ../client/gdaemonfile.c:1179
+#: ../client/gdaemonfile.c:1242 ../client/gdaemonfile.c:1308
+#: ../client/gdaemonfile.c:2639 ../client/gvfsiconloadable.c:155
 msgid "Didn't get stream file descriptor"
 msgstr "Akış dosyası belirteci alınmadı"
 
-#: ../client/gdaemonfile.c:1349 ../client/gdaemonfile.c:1366
-msgid "Invalid return value from call"
-msgstr "call geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfile.c:1850
-msgid "Invalid return value from get_filesystem_info"
-msgstr "get_filesystem_info geçersiz bir değer döndürdü"
-
 #. translators: this is an error message when there is no user visible "mount" object
 #. corresponding to a particular path/uri
-#: ../client/gdaemonfile.c:1963
+#: ../client/gdaemonfile.c:1981
 msgid "Could not find enclosing mount"
 msgstr "Kapsanılan bağlantı bulunamadı"
 
-#: ../client/gdaemonfile.c:1993
+#: ../client/gdaemonfile.c:2011
 #, c-format
 msgid "Invalid filename %s"
 msgstr "Geçersiz dosya adı %s"
 
-#: ../client/gdaemonfile.c:2035
-msgid "Invalid return value from query_filesystem_info"
-msgstr "query_filesystem_info geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfile.c:2229 ../client/gdaemonvfs.c:1187
-#: ../client/gdaemonvfs.c:1321 ../client/gdaemonvfs.c:1374
+#: ../client/gdaemonfile.c:2256 ../client/gdaemonvfs.c:1198
+#: ../client/gdaemonvfs.c:1333 ../client/gdaemonvfs.c:1386
 #, c-format
 msgid "Error setting file metadata: %s"
 msgstr "Dosya metadata atanırken hata: %s"
 
-#: ../client/gdaemonfile.c:2230 ../client/gdaemonvfs.c:1375
+#: ../client/gdaemonfile.c:2257 ../client/gdaemonvfs.c:1387
 msgid "values must be string or list of strings"
 msgstr "değerler dizgi veya dizgiler listesi olmalıdır"
 
-#: ../client/gdaemonfile.c:2533
-msgid "Invalid return value from monitor_dir"
-msgstr "monitor_dir geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfile.c:2582
-msgid "Invalid return value from monitor_file"
-msgstr "monitor_file geçersiz bir değer döndürdü"
-
-#: ../client/gdaemonfileenumerator.c:448
+#: ../client/gdaemonfileenumerator.c:466 ../client/gdaemonfileenumerator.c:549
+#: ../client/gdaemonfileenumerator.c:600
 #: ../client/gdaemonfileinputstream.c:630
 #: ../client/gdaemonfileinputstream.c:783
 #: ../client/gdaemonfileinputstream.c:901
@@ -97,22 +83,22 @@ msgstr "monitor_file geçersiz bir değer döndürdü"
 #: ../client/gdaemonfileoutputstream.c:506
 #: ../client/gdaemonfileoutputstream.c:681
 #: ../client/gdaemonfileoutputstream.c:873
-#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1048
-#: ../daemon/gvfsbackendobexftp.c:1066 ../daemon/gvfsbackendobexftp.c:1087
-#: ../daemon/gvfsbackendobexftp.c:1206 ../daemon/gvfsbackendobexftp.c:1343
-#: ../daemon/gvfsbackendobexftp.c:1407 ../daemon/gvfsbackendobexftp.c:1609
-#: ../daemon/gvfsbackendobexftp.c:1716 ../daemon/gvfsbackendobexftp.c:1866
-#: ../daemon/gvfsbackendobexftp.c:1893 ../daemon/gvfsbackendobexftp.c:1952
-#: ../daemon/gvfsbackendobexftp.c:1974 ../daemon/gvfsbackendobexftp.c:2037
-#: ../daemon/gvfsbackendobexftp.c:2056 ../daemon/gvfsbackendsmb.c:1163
+#: ../client/gdaemonfileoutputstream.c:1052 ../client/gvfsdaemondbus.c:1062
+#: ../daemon/gvfsbackendobexftp.c:1085 ../daemon/gvfsbackendobexftp.c:1106
+#: ../daemon/gvfsbackendobexftp.c:1225 ../daemon/gvfsbackendobexftp.c:1362
+#: ../daemon/gvfsbackendobexftp.c:1426 ../daemon/gvfsbackendobexftp.c:1628
+#: ../daemon/gvfsbackendobexftp.c:1735 ../daemon/gvfsbackendobexftp.c:1897
+#: ../daemon/gvfsbackendobexftp.c:1924 ../daemon/gvfsbackendobexftp.c:1983
+#: ../daemon/gvfsbackendobexftp.c:2005 ../daemon/gvfsbackendobexftp.c:2068
+#: ../daemon/gvfsbackendobexftp.c:2087 ../daemon/gvfsbackendsmb.c:1179
 #: ../daemon/gvfsbackendtest.c:91 ../daemon/gvfsbackendtest.c:124
-#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:319
-#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1030
-#: ../monitor/proxy/gproxydrive.c:521 ../monitor/proxy/gproxydrive.c:609
-#: ../monitor/proxy/gproxydrive.c:757 ../monitor/proxy/gproxydrive.c:892
-#: ../monitor/proxy/gproxydrive.c:943 ../monitor/proxy/gproxydrive.c:1067
-#: ../monitor/proxy/gproxymount.c:477 ../monitor/proxy/gproxymount.c:562
-#: ../monitor/proxy/gproxyvolume.c:814 ../monitor/proxy/gproxyvolume.c:891
+#: ../daemon/gvfsbackendtest.c:187 ../daemon/gvfschannel.c:322
+#: ../daemon/gvfsftptask.c:202 ../monitor/gdu/ggdumount.c:1073
+#: ../monitor/proxy/gproxydrive.c:541 ../monitor/proxy/gproxydrive.c:629
+#: ../monitor/proxy/gproxydrive.c:777 ../monitor/proxy/gproxydrive.c:912
+#: ../monitor/proxy/gproxydrive.c:963 ../monitor/proxy/gproxydrive.c:1087
+#: ../monitor/proxy/gproxymount.c:488 ../monitor/proxy/gproxymount.c:573
+#: ../monitor/proxy/gproxyvolume.c:826 ../monitor/proxy/gproxyvolume.c:903
 msgid "Operation was cancelled"
 msgstr "İşlem iptal edildi"
 
@@ -140,24 +126,20 @@ msgstr "Akış sonu"
 msgid "Seek not supported on stream"
 msgstr "Akış üzerinde atlama desteklenmiyor"
 
-#: ../client/gdaemonvfs.c:831
+#: ../client/gdaemonvfs.c:830
 #, c-format
 msgid "Error while getting mount info: %s"
 msgstr "Bağlanma bilgileri alınırken hata oluştu: %s"
 
-#: ../client/gdaemonvfs.c:1188
+#: ../client/gdaemonvfs.c:1199
 msgid "Can't contact session bus"
 msgstr "Oturum veri yoluna bağlanılamıyor"
 
-#: ../client/gvfsdaemondbus.c:570 ../client/gvfsdaemondbus.c:1002
+#: ../client/gvfsdaemondbus.c:575 ../client/gvfsdaemondbus.c:1016
 #, c-format
 msgid "Error connecting to daemon: %s"
 msgstr "Servise bağlanırken hata oluştu: %s"
 
-#: ../client/gvfsiconloadable.c:145
-msgid "Invalid return value from open_icon_for_read"
-msgstr "open_icon_for_read geçersiz değer döndü"
-
 #: ../common/gsysutils.c:136
 #, c-format
 msgid "Error creating socket: %s"
@@ -168,11 +150,11 @@ msgstr "Soket oluşturulurken hata oluştu: %s"
 msgid "Error connecting to socket: %s"
 msgstr "Sokete bağlanırken hata oluştu: %s"
 
-#: ../common/gvfsdaemonprotocol.c:521
+#: ../common/gvfsdaemonprotocol.c:518
 msgid "Invalid file info format"
 msgstr "Geçersiz dosya bilgi biçimi "
 
-#: ../common/gvfsdaemonprotocol.c:538
+#: ../common/gvfsdaemonprotocol.c:536
 msgid "Invalid attribute info list content"
 msgstr "Geçersiz öznitelik bilgi listesi içeriği"
 
@@ -236,106 +218,585 @@ msgstr "GVfsIcon kodlama sürüm %d işlenemiyor"
 msgid "Malformed input data for GVfsIcon"
 msgstr "GVfsIcon için girdi verisi bozuk"
 
-#: ../daemon/daemon-main.c:76 ../daemon/daemon-main.c:230
+#: ../daemon/daemon-main.c:81 ../daemon/daemon-main.c:236
 #, c-format
 msgid "Error connecting to D-Bus: %s"
 msgstr "D-Bus'a bağlanırken hata oluştu: %s"
 
 #. translators: This is the default daemon's application name,
-#. * the %s is the type of the backend, like "ftp"
-#: ../daemon/daemon-main.c:91
+#. * the %s is the type of the backend, like "FTP"
+#: ../daemon/daemon-main.c:96
 #, c-format
 msgid "%s Filesystem Service"
 msgstr "%s Dosya Sistemi Servisi"
 
-#: ../daemon/daemon-main.c:110
+#: ../daemon/daemon-main.c:115 ../programs/gvfs-copy.c:90
+#: ../programs/gvfs-move.c:78
 #, c-format
 msgid "Error: %s"
 msgstr "Hata: %s"
 
-#: ../daemon/daemon-main.c:155
+#: ../daemon/daemon-main.c:161
 #, c-format
 msgid "Usage: %s --spawner dbus-id object_path"
 msgstr "Kullanım: %s ---spawner dbus-id nesne_yolu"
 
-#: ../daemon/daemon-main.c:179 ../daemon/daemon-main.c:197
+#: ../daemon/daemon-main.c:185 ../daemon/daemon-main.c:203
 #, c-format
 msgid "Usage: %s key=value key=value ..."
 msgstr "Kullanım: %s anahtar=değer anahtar=değer ..."
 
-#: ../daemon/daemon-main.c:195
+#: ../daemon/daemon-main.c:201
 #, c-format
 msgid "No mount type specified"
 msgstr "Belirtilmiş bağlama türü yok"
 
-#: ../daemon/daemon-main.c:265
+#: ../daemon/daemon-main.c:271
 #, c-format
 msgid "mountpoint for %s already running"
 msgstr "%s için bağlama noktası zaten çalışıyor"
 
-#: ../daemon/daemon-main.c:276
+#: ../daemon/daemon-main.c:282
 msgid "error starting mount daemon"
 msgstr "bağlama servisi başlatılırken hata"
 
-#: ../daemon/gvfsbackend.c:899 ../monitor/gdu/ggdumount.c:882
-msgid "Unmount Anyway"
-msgstr "Gene de Bağı Kes"
+#: ../daemon/gvfsafpconnection.c:1305 ../daemon/gvfsafpconnection.c:1332
+msgid "Got EOS"
+msgstr "EOS Al"
 
-#: ../daemon/gvfsbackend.c:900 ../monitor/gdu/ggdudrive.c:1010
-#: ../monitor/gdu/ggdumount.c:883
-msgid "Cancel"
-msgstr "İptal"
+#: ../daemon/gvfsafpserver.c:127
+msgid "Server doesn't support passwords longer than 256 characters"
+msgstr "Sunucu, 256 karakterden uzun parolaları desteklemiyor"
+
+#: ../daemon/gvfsafpserver.c:155 ../daemon/gvfsafpserver.c:469
+msgid "An invalid username was provided"
+msgstr "Geçersiz bir kullanıcı adı girildi"
+
+#: ../daemon/gvfsafpserver.c:334 ../daemon/gvfsafpserver.c:563
+#, c-format
+msgid "AFP server %s declined the submitted password"
+msgstr "AFP sunucusu %s, gönderilen parolayı reddetti"
 
-#: ../daemon/gvfsbackend.c:902 ../monitor/gdu/ggdumount.c:884
+#: ../daemon/gvfsafpserver.c:365 ../daemon/gvfsafpserver.c:585
+#, c-format
+msgid "Login to AFP server %s failed"
+msgstr "AFP sunucusu %s'e giriş başarısız oldu"
+
+#: ../daemon/gvfsafpserver.c:414
+msgid "Server doesn't support passwords longer than 64 characters"
+msgstr "Sunucu 64 karakterden uzun parolaları desteklemiyor"
+
+#: ../daemon/gvfsafpserver.c:610 ../daemon/gvfsafpserver.c:639
+#, c-format
+msgid "AFP server %s doesn't support anonymous login"
+msgstr "AFP sunucusu %s, anonim oturum açmayı desteklemiyor"
+
+#: ../daemon/gvfsafpserver.c:645
+#, c-format
+msgid "Anonymous login to AFP server %s failed, got error code: %d"
+msgstr "AFP sunucusu %s'e anonim giriş başarısız oldu, alınan hata kodu: %d"
+
+#: ../daemon/gvfsafpserver.c:669
+#, c-format
 msgid ""
-"Volume is busy\n"
-"One or more applications are keeping the volume busy."
+"Login to AFP server %s failed (no suitable authentication mechanism found)"
 msgstr ""
-"Birim meşgul\n"
-"Bir ya da daha fazla uygulama birimi meşgul tutuyor."
+"AFP sunucusu %s'e giriş başarısız oldu (uygun bir kimlik doğrulama "
+"mekanizması bulunamadı)"
 
-#. 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:318 ../daemon/gvfsbackendsftp.c:2189
-#: ../daemon/gvfsftpdircache.c:419
+#: ../daemon/gvfsafpserver.c:740
 #, c-format
-msgid "/ on %s"
-msgstr "%s üzerinde /"
+#| msgid "Failed to get folder list"
+msgid "Failed to connect to server (%s)"
+msgstr "Sunucuya bağlantı başarısız oldu (%s)"
 
-#: ../daemon/gvfsbackendarchive.c:518 ../daemon/gvfsbackendftp.c:504
-#: ../daemon/gvfsbackendsftp.c:1680
-msgid "No hostname specified"
-msgstr "Makine adı belirtilmemiş"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsafpserver.c:830
+#, c-format
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter password for afp as %s on %s"
+msgstr "%2$s üzerinde %1$s olarak oturum açmak için afp parolasını girin"
+
+#. translators: %s here is the hostname
+#: ../daemon/gvfsafpserver.c:833
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for afp on %s"
+msgstr "%s üzerindeki afp için parola girin"
+
+#: ../daemon/gvfsafpserver.c:865 ../daemon/gvfsbackendftp.c:518
+#: ../daemon/gvfsbackendsftp.c:985 ../daemon/gvfsbackendsmbbrowse.c:995
+#: ../daemon/gvfsbackendsmb.c:619
+msgid "Password dialog cancelled"
+msgstr "Parola penceresi iptal edildi"
+
+#: ../daemon/gvfsbackendafc.c:208
+msgid "Internal Apple File Control error"
+msgstr "Dahili Apple Dosya Denetim hatası"
+
+#: ../daemon/gvfsbackendafc.c:212 ../daemon/gvfsbackendftp.c:736
+msgid "File does not exist"
+msgstr "Dosya mevcut değil"
+
+#: ../daemon/gvfsbackendafc.c:216
+#| msgid "Directory not empty"
+msgid "The directory is not empty"
+msgstr "Dizin boş değil"
+
+#: ../daemon/gvfsbackendafc.c:220
+#| msgid "The file is not a directory"
+msgid "The device did not respond"
+msgstr "Aygıt yanıt vermedi"
+
+#: ../daemon/gvfsbackendafc.c:224
+#| msgid "The specified location is not supported"
+msgid "The connection was interrupted"
+msgstr "Bağlantı kesintiye uğradı"
+
+#: ../daemon/gvfsbackendafc.c:228
+#| msgid "Invalid reply received"
+msgid "Invalid Apple File Control data received"
+msgstr "Geçersiz Apple Dosya Denetim verisi alındı"
+
+#: ../daemon/gvfsbackendafc.c:232
+#, c-format
+msgid "Unhandled Apple File Control error (%d)"
+msgstr "İşlenmemiş Apple Dosya Denetim hatası (%d)"
+
+#: ../daemon/gvfsbackendafc.c:248
+msgid "Listing applications installed on device failed"
+msgstr "Aygıt üzerinde kurulu uygulamaların listelenmesi başarısız oldu"
+
+#: ../daemon/gvfsbackendafc.c:264
+msgid "Accessing application icons on device failed"
+msgstr "Aygıttaki uygulama simgelerine erişim başarısız oldu"
+
+#: ../daemon/gvfsbackendafc.c:281
+msgid "Lockdown Error: Invalid Argument"
+msgstr "Kilitleme Hatası: Geçersiz Bağımsız Değişken"
+
+#: ../daemon/gvfsbackendafc.c:285 ../daemon/gvfsbackendafp.c:463
+#: ../daemon/gvfsbackendafp.c:1049 ../daemon/gvfsbackendafp.c:1203
+#: ../daemon/gvfsbackendafp.c:1448 ../daemon/gvfsbackendafp.c:1577
+#: ../daemon/gvfsbackendafp.c:1704 ../daemon/gvfsbackendafp.c:2210
+#: ../daemon/gvfsbackendafp.c:2346 ../daemon/gvfsbackendafp.c:2865
+#: ../daemon/gvfsbackendafp.c:2965 ../daemon/gvfsbackendafp.c:3535
+#: ../daemon/gvfsbackendafp.c:4089 ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:1834 ../daemon/gvfsftptask.c:399
+msgid "Permission denied"
+msgstr "İzin verilmedi"
+
+#: ../daemon/gvfsbackendafc.c:289
+#, c-format
+msgid "Unhandled Lockdown error (%d)"
+msgstr "İşlenmemiş Kilitleme hatası (%d)"
+
+#: ../daemon/gvfsbackendafc.c:306
+msgid "libimobiledevice Error: Invalid Argument"
+msgstr "libimobiledevice Hatası: Geçersiz Bağımsız Değişken"
+
+#: ../daemon/gvfsbackendafc.c:310
+msgid ""
+"libimobiledevice Error: No device found. Make sure usbmuxd is set up "
+"correctly."
+msgstr ""
+"libimobiledevice Hatası: Aygıt bulunamadı. usbmuxd'in doğru olarak "
+"kurulduğundan "
+"emin olun."
 
-#: ../daemon/gvfsbackendarchive.c:529 ../daemon/gvfsbackendarchive.c:558
-#: ../daemon/gvfsbackenddav.c:1631 ../daemon/gvfsbackendhttp.c:306
-#: ../daemon/gvfsbackendobexftp.c:842 ../daemon/gvfsbackendobexftp.c:858
-#: ../daemon/gvfsbackendobexftp.c:877 ../daemon/gvfsbackendsmb.c:648
+#: ../daemon/gvfsbackendafc.c:314
+#, c-format
+msgid "Unhandled libimobiledevice error (%d)"
+msgstr "İşlenmemiş libimobiledevice hatası (%d)"
+
+#: ../daemon/gvfsbackendafc.c:381
+msgid "Try again"
+msgstr "Tekrar deneyin"
+
+#: ../daemon/gvfsbackendafc.c:381 ../daemon/gvfsbackend.c:963
+#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:926
+msgid "Cancel"
+msgstr "İptal"
+
+#: ../daemon/gvfsbackendafc.c:399 ../daemon/gvfsbackendarchive.c:550
+#: ../daemon/gvfsbackendarchive.c:579 ../daemon/gvfsbackenddav.c:1797
+#: ../daemon/gvfsbackendhttp.c:309 ../daemon/gvfsbackendobexftp.c:862
+#: ../daemon/gvfsbackendobexftp.c:878 ../daemon/gvfsbackendobexftp.c:897
+#: ../daemon/gvfsbackendsmb.c:662
 msgid "Invalid mount spec"
 msgstr "Geçersiz bağlama belirtimi"
 
-#: ../daemon/gvfsbackendarchive.c:616 ../daemon/gvfsbackendarchive.c:660
-#: ../daemon/gvfsbackendarchive.c:710 ../daemon/gvfsbackendarchive.c:739
-#: ../daemon/gvfsbackendcdda.c:986 ../daemon/gvfsbackendcomputer.c:627
-#: ../daemon/gvfsbackenddnssd.c:398 ../daemon/gvfsbackendftp.c:904
-#: ../daemon/gvfsbackendnetwork.c:646 ../daemon/gvfsbackendsmbbrowse.c:1085
-#: ../daemon/gvfsbackendsmbbrowse.c:1152 ../daemon/gvfsbackendsmbbrowse.c:1324
-#: ../daemon/gvfsbackendsmbbrowse.c:1394
+#: ../daemon/gvfsbackendafc.c:405 ../daemon/gvfsbackendafc.c:435
+msgid "Invalid AFC location: must be in the form of afc://uuid:port-number"
+msgstr "Geçersiz AFC konumu: afc://uuid:liman-numarası biçiminde olmalı"
+
+#: ../daemon/gvfsbackendafc.c:421
 #, c-format
-msgid "File doesn't exist"
-msgstr "Dosya mevcut değil"
+msgid "Apple Mobile Device"
+msgstr "Apple Cep Aygıtı"
 
-#: ../daemon/gvfsbackendarchive.c:624 ../daemon/gvfsbackendcomputer.c:645
-#: ../daemon/gvfsbackendgphoto2.c:1865 ../daemon/gvfsbackendobexftp.c:1052
-#: ../daemon/gvfsbackendsmb.c:702 ../daemon/gvfsbackendtrash.c:232
+#: ../daemon/gvfsbackendafc.c:426
+#, c-format
+msgid "Apple Mobile Device, Jailbroken"
+msgstr "Apple Cep Aygıtı, Jailbreak Yapılmış"
+
+#: ../daemon/gvfsbackendafc.c:431
+#, c-format
+msgid "Documents on Apple Mobile Device"
+msgstr "Apple Cep Aygıtındaki Belgeler"
+
+#: ../daemon/gvfsbackendafc.c:489
+#, c-format
+msgid "%s (jailbreak)"
+msgstr "%s (jailbreak)"
+
+#. translators:
+#. * This is "Documents on foo" where foo is the device name, eg.:
+#. * Documents on Alan Smithee's iPhone
+#: ../daemon/gvfsbackendafc.c:496 ../monitor/afc/afcvolume.c:125
+#, c-format
+#| msgid "cdda mount on %s"
+msgid "Documents on %s"
+msgstr "%s üzerindeki belgeler"
+
+#. 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:575
+#, c-format
+msgid ""
+"The device '%s' is locked. Enter the passcode on the device and click 'Try "
+"again'."
+msgstr ""
+"'%s' aygıtı kilitlenmiş. Aygıt üzerinden geçiş kodunu girin ve 'Tekrar "
+"dene'ye "
+"tıklayın."
+
+#: ../daemon/gvfsbackendafc.c:914 ../daemon/gvfsbackendarchive.c:655
+#: ../daemon/gvfsbackendcomputer.c:645 ../daemon/gvfsbackendgphoto2.c:1808
+#: ../daemon/gvfsbackendobexftp.c:1071 ../daemon/gvfsbackendsmb.c:718
+#: ../daemon/gvfsbackendtrash.c:232
 msgid "Can't open directory"
 msgstr "Dizin açılamıyor"
 
-#: ../daemon/gvfsbackendarchive.c:748 ../daemon/gvfsbackendburn.c:680
+#: ../daemon/gvfsbackendafc.c:924 ../daemon/gvfsbackendafpbrowse.c:257
+#: ../daemon/gvfsbackendafpbrowse.c:390 ../daemon/gvfsbackendafpbrowse.c:422
+#: ../daemon/gvfsbackendafp.c:467 ../daemon/gvfsbackendafp.c:780
+#: ../daemon/gvfsbackendafp.c:2869 ../daemon/gvfsbackendarchive.c:647
+#: ../daemon/gvfsbackendarchive.c:695 ../daemon/gvfsbackendarchive.c:747
+#: ../daemon/gvfsbackendarchive.c:776 ../daemon/gvfsbackendcdda.c:987
+#: ../daemon/gvfsbackendcomputer.c:627 ../daemon/gvfsbackenddnssd.c:398
+#: ../daemon/gvfsbackendftp.c:1067 ../daemon/gvfsbackendnetwork.c:602
+#: ../daemon/gvfsbackendsmbbrowse.c:1094 ../daemon/gvfsbackendsmbbrowse.c:1161
+#: ../daemon/gvfsbackendsmbbrowse.c:1333 ../daemon/gvfsbackendsmbbrowse.c:1403
+#, c-format
+msgid "File doesn't exist"
+msgstr "Dosya mevcut değil"
+
+#: ../daemon/gvfsbackendafc.c:1115 ../daemon/gvfsbackendafc.c:2458
+#| msgid "backups not supported yet"
+msgid "Backups are not yet supported."
+msgstr "Yedekler henüz desteklenmiyor."
+
+#: ../daemon/gvfsbackendafc.c:1287
+#| msgid "invalid type"
+msgid "Invalid seek type"
+msgstr "Geçersiz arama türü"
+
+#: ../daemon/gvfsbackendafc.c:2295 ../daemon/gvfsbackendafp.c:3809
+#: ../daemon/gvfsbackendftp.c:1087 ../daemon/gvfsbackendftp.c:1135
+#: ../daemon/gvfsbackendftp.c:1156 ../daemon/gvfsbackendsftp.c:1832
+#: ../daemon/gvfsbackendsftp.c:4633 ../daemon/gvfsbackendsmb.c:1719
+#: ../daemon/gvfsftptask.c:391
+msgid "Operation unsupported"
+msgstr "İşlem desteklenmiyor"
+
+#: ../daemon/gvfsbackendafpbrowse.c:121 ../daemon/gvfsbackendafp.c:479
+#: ../daemon/gvfsbackendafp.c:600 ../daemon/gvfsbackendafp.c:681
+#: ../daemon/gvfsbackendafp.c:784 ../daemon/gvfsbackendafp.c:895
+#: ../daemon/gvfsbackendafp.c:1073 ../daemon/gvfsbackendafp.c:1227
+#: ../daemon/gvfsbackendafp.c:1323 ../daemon/gvfsbackendafp.c:1476
+#: ../daemon/gvfsbackendafp.c:1605 ../daemon/gvfsbackendafp.c:1716
+#: ../daemon/gvfsbackendafp.c:2234 ../daemon/gvfsbackendafp.c:2370
+#: ../daemon/gvfsbackendafp.c:2509 ../daemon/gvfsbackendafp.c:2746
+#: ../daemon/gvfsbackendafp.c:2877 ../daemon/gvfsbackendafp.c:2977
+#: ../daemon/gvfsbackendafp.c:3551 ../daemon/gvfsbackendafp.c:4106
+#, c-format
+msgid "Got error code: %d from server"
+msgstr "Sunucudan alınan hata kodu: %d"
+
+#: ../daemon/gvfsbackendafpbrowse.c:285 ../daemon/gvfsbackendsmbbrowse.c:1089
+#: ../daemon/gvfsbackendsmbbrowse.c:1135
+msgid "The file is not a mountable"
+msgstr "Dosya bağlanılabilir değil"
+
+#: ../daemon/gvfsbackendafpbrowse.c:498
+#, c-format
+#| msgid "sftp for %s on %s"
+msgid "AFP shares for %s on %s"
+msgstr "%s için %s üzerindeki AFP paylaşımları"
+
+#: ../daemon/gvfsbackendafpbrowse.c:501
+#, c-format
+#| msgid "Windows shares on %s"
+msgid "AFP shares on %s"
+msgstr "%s üzerindeki AFP paylaşımları"
+
+#: ../daemon/gvfsbackendafpbrowse.c:534 ../daemon/gvfsbackendafp.c:4294
+#: ../daemon/gvfsbackendarchive.c:539 ../daemon/gvfsbackendftp.c:667
+#: ../daemon/gvfsbackendsftp.c:1745
+msgid "No hostname specified"
+msgstr "Makine adı belirtilmemiş"
+
+#: ../daemon/gvfsbackendafpbrowse.c:602 ../daemon/gvfsbackendafp.c:4382
+msgid "Apple Filing Protocol Service"
+msgstr "Apple Dosyalama Kuralı Hizmeti"
+
+#: ../daemon/gvfsbackendafp.c:471 ../daemon/gvfsbackendafp.c:518
+#: ../daemon/gvfsbackendafp.c:2873 ../daemon/gvfsbackendafp.c:3276
+#| msgid "File is directory"
+msgid "File is a directory"
+msgstr "Dosya bir dizin"
+
+#: ../daemon/gvfsbackendafp.c:475
+msgid "Too many files open"
+msgstr "Çok fazla dosya açık"
+
+#: ../daemon/gvfsbackendafp.c:1053 ../daemon/gvfsbackendafp.c:1589
+#: ../daemon/gvfsbackendafp.c:2350 ../daemon/gvfsbackendafp.c:2505
+#: ../daemon/gvfsbackendafp.c:2969
+msgid "Not enough space on volume"
+msgstr "Birimde yeterli boş alan yok"
+
+#: ../daemon/gvfsbackendafp.c:1057 ../daemon/gvfsbackendafp.c:1207
+#| msgid "Target file exists"
+msgid "Target file is open"
+msgstr "Hedef dosya açık"
+
+#: ../daemon/gvfsbackendafp.c:1061 ../daemon/gvfsbackendafp.c:1464
+#: ../daemon/gvfsbackendafp.c:1593 ../daemon/gvfsbackendafp.c:1919
+#: ../daemon/gvfsbackendafp.c:2116 ../daemon/gvfsbackenddav.c:2257
+#: ../daemon/gvfsbackenddav.c:2510 ../daemon/gvfsbackenddav.c:2621
+#: ../daemon/gvfsbackendftp.c:752 ../daemon/gvfsbackendftp.c:933
+#: ../daemon/gvfsbackendftp.c:1372 ../daemon/gvfsbackendftp.c:1552
+#: ../daemon/gvfsbackendsftp.c:4285 ../daemon/gvfsbackendsmb.c:2082
+msgid "Target file already exists"
+msgstr "Hedef dosya zaten mevcut"
+
+#: ../daemon/gvfsbackendafp.c:1065 ../daemon/gvfsbackendafp.c:2358
+#| msgid "File doesn't exist"
+msgid "Ancestor directory doesn't exist"
+msgstr "Üst dizin yok"
+
+#: ../daemon/gvfsbackendafp.c:1069 ../daemon/gvfsbackendafp.c:1223
+#: ../daemon/gvfsbackendafp.c:1712 ../daemon/gvfsbackendafp.c:2230
+#: ../daemon/gvfsbackendafp.c:2366
+msgid "Volume is read-only"
+msgstr "Birim salt okunur"
+
+#: ../daemon/gvfsbackendafp.c:1211 ../daemon/gvfsbackendburn.c:425
+#: ../daemon/gvfsbackenddav.c:2550 ../daemon/gvfsbackendsftp.c:1828
+msgid "Directory not empty"
+msgstr "Dizin boş değil"
+
+#: ../daemon/gvfsbackendafp.c:1215
+msgid "Target object is marked as DeleteInhibit"
+msgstr "Hedef nesne DeleteInhibit olarak işaretlenmiş"
+
+#: ../daemon/gvfsbackendafp.c:1219 ../daemon/gvfsbackendafp.c:1708
+#: ../daemon/gvfsbackendafp.c:2226
+#| msgid "File doesn't exist"
+msgid "Target object doesn't exist"
+msgstr "Hedef nesne mevcut değil"
+
+#: ../daemon/gvfsbackendafp.c:1319
+msgid "ID not found"
+msgstr "Kimlik (ID) bulunamadı"
+
+#: ../daemon/gvfsbackendafp.c:1452
+#| msgid "Can't move directory over directory"
+msgid "Can't move directory into one of it's descendants"
+msgstr "Dizin, alt dizinlerinden birinin içine taşınamaz"
+
+#: ../daemon/gvfsbackendafp.c:1456
+#| msgid "Can't move directory over directory"
+msgid "Can't move sharepoint into a shared directory"
+msgstr "Paylaşım noktası (sharepoint), paylaşılan bir dizine taşınamaz"
+
+#: ../daemon/gvfsbackendafp.c:1460
+#| msgid "Can't move directory over directory"
+msgid "Can't move a shared directory into the Trash"
+msgstr "Paylaşılan bir dizin, Çöpe taşınamaz"
+
+#: ../daemon/gvfsbackendafp.c:1468
+msgid "Object being moved is marked as RenameInhibit"
+msgstr "Taşınmakta olan nesne, RenameInhibit olarak işaretlenmiş"
+
+#: ../daemon/gvfsbackendafp.c:1472
+#| msgid "File doesn't exist"
+msgid "Object being moved doesn't exist"
+msgstr "Taşınmakta olan nesne mevcut değil"
+
+#: ../daemon/gvfsbackendafp.c:1581
+msgid "Server doesn't support the FPCopyFile operation"
+msgstr "Sunucu, FPCopyFile işlemini desteklemiyor"
+
+#: ../daemon/gvfsbackendafp.c:1585
+#| msgid "Couldn't get stream file descriptor"
+msgid "Couldn't open source file as Read/DenyWrite"
+msgstr "Kaynak dosya, Read/DenyWrite olarak açılamadı"
+
+#: ../daemon/gvfsbackendafp.c:1597
+msgid "Source file and/or destination directory doesn't exist"
+msgstr "Kaynak dosya ve/veya hedef dizin mevcut değil"
+
+#: ../daemon/gvfsbackendafp.c:1601
+#| msgid "The file is not a directory"
+msgid "Source file is a directory"
+msgstr "Kaynak dosya bir dizindir"
+
+#: ../daemon/gvfsbackendafp.c:1909 ../daemon/gvfsbackendburn.c:876
+#: ../daemon/gvfsbackendftp.c:1544 ../daemon/gvfsbackendobexftp.c:1779
+msgid "Can't copy directory over directory"
+msgstr "Dizin üstüne dizin kopyalanamıyor"
+
+#: ../daemon/gvfsbackendafp.c:1912 ../daemon/gvfsbackendafp.c:2109
+#: ../daemon/gvfsbackenddav.c:2201 ../daemon/gvfsbackendftp.c:773
+#: ../daemon/gvfsbackendsftp.c:2333 ../daemon/gvfsbackendsftp.c:3069
+#: ../daemon/gvfsbackendsftp.c:3408 ../daemon/gvfsbackendsftp.c:4276
+msgid "File is directory"
+msgstr "Dosya bir dizin"
+
+#: ../daemon/gvfsbackendafp.c:1928 ../daemon/gvfsbackendburn.c:892
+#: ../daemon/gvfsbackendftp.c:1567 ../daemon/gvfsbackendobexftp.c:1794
+msgid "Can't recursively copy directory"
+msgstr "Dizin iç içe kopyalanamıyor"
+
+#: ../daemon/gvfsbackendafp.c:2106 ../daemon/gvfsbackendsftp.c:4271
+#: ../daemon/gvfsbackendsmb.c:2071
+msgid "Can't move directory over directory"
+msgstr "Dizin üstüne dizin taşınamıyor"
+
+#: ../daemon/gvfsbackendafp.c:2214 ../daemon/gvfsbackendafp.c:2308
+#| msgid "Can't eject file"
+msgid "Can't rename volume"
+msgstr "Birim yeniden adlandırılamıyor"
+
+#: ../daemon/gvfsbackendafp.c:2218
+#| msgid "Name already exists"
+msgid "Object with that name already exists"
+msgstr "Zaten bu isimde bir nesne var"
+
+#: ../daemon/gvfsbackendafp.c:2222
+msgid "Target object is marked as RenameInhibit"
+msgstr "Hedef nesne, RenameInhibit olarak işaretlenmiş"
+
+#: ../daemon/gvfsbackendafp.c:2354
+msgid "Volume is flat and doesn't support directories"
+msgstr "Birim düzleştirilmiş; ve dizinleri desteklemiyor"
+
+#: ../daemon/gvfsbackendafp.c:2362
+#| msgid "Target file already exists"
+msgid "Target directory already exists"
+msgstr "Hedef dizin zaten var"
+
+#: ../daemon/gvfsbackendafp.c:2501
+msgid "File is not open for write access"
+msgstr "Dosya, yazma erişimi için açık değil"
+
+#: ../daemon/gvfsbackendafp.c:2742
+msgid "File is not open for read access"
+msgstr "Dosya, okuma erişimi için açık değil"
+
+#: ../daemon/gvfsbackendafp.c:2973
+msgid "Range lock conflict exists"
+msgstr "Aralık kilidi çakışması var"
+
+#: ../daemon/gvfsbackendafp.c:3212
+#, c-format
+#| msgid "Unable to create temporary file"
+msgid "Couldn't create temporary file (%s)"
+msgstr "Geçici dosya oluşturulamadı (%s)"
+
+#: ../daemon/gvfsbackendafp.c:3283 ../daemon/gvfsbackenddav.c:2330
+#: ../daemon/gvfsbackendsftp.c:3421 ../daemon/gvfsbackendsmb.c:1148
+msgid "The file was externally modified"
+msgstr "Dosya harici olarak değiştirilmiş"
+
+#: ../daemon/gvfsbackendafp.c:3314 ../daemon/gvfsbackendftp.c:981
+#: ../daemon/gvfsbackendftp.c:1335 ../daemon/gvfsbackendsftp.c:3274
+msgid "backups not supported yet"
+msgstr "yedekler henüz desteklenmiyor"
+
+#: ../daemon/gvfsbackendafp.c:3539
+#| msgid "File doesn't exist"
+msgid "Directory doesn't exist"
+msgstr "Dizin mevcut değil"
+
+#: ../daemon/gvfsbackendafp.c:3543
+#| msgid "Target %s is not a directory\n"
+msgid "Target object is not a directory"
+msgstr "Hedef nesne, bir dizin değil"
+
+#: ../daemon/gvfsbackendafp.c:3795 ../daemon/gvfsbackendftp.c:1128
+#: ../daemon/gvfsbackendsftp.c:4643
+#| msgid "Invalid attribute type %s\n"
+msgid "Invalid attribute type (uint32 expected)"
+msgstr "Geçersiz öznitelik türü (uint32 bekleniyor)"
+
+#: ../daemon/gvfsbackendafp.c:4093
+#| msgid "Not supported"
+msgid "Command not supported"
+msgstr "Komut desteklenmiyor"
+
+#: ../daemon/gvfsbackendafp.c:4097
+msgid "User's password has expired"
+msgstr "Kullanıcının parolasının süresi dolmuş"
+
+#: ../daemon/gvfsbackendafp.c:4101
+msgid "User's password needs to be changed"
+msgstr "Kullanıcının parolasının değiştirilmesi gerekiyor"
+
+#: ../daemon/gvfsbackendafp.c:4111
+#, c-format
+msgid "FPGetUserInfo failed (%s)"
+msgstr "FPGetUserInfo başarısız (%s)"
+
+#: ../daemon/gvfsbackendafp.c:4250
+#, c-format
+#| msgid "sftp for %s on %s"
+msgid "AFP volume %s for %s on %s"
+msgstr "%3$s üzerindeki %2$s için %1$s AFP birimi"
+
+#: ../daemon/gvfsbackendafp.c:4254
+#, c-format
+#| msgid "sftp for %s on %s"
+msgid "AFP volume %s on %s"
+msgstr "%2$s üzerindeki %1$s AFP birimi"
+
+#: ../daemon/gvfsbackendafp.c:4272
+#, c-format
+msgid "Couldn't mount AFP volume %s on %s"
+msgstr "%2$s üzerindeki %1$s AFP birimi bağlanamadı"
+
+#: ../daemon/gvfsbackendafp.c:4303
+#| msgid "No drive specified"
+msgid "No volume specified"
+msgstr "Birim belirtilmemiş"
+
+#. 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:2269
+#: ../daemon/gvfsftpdircache.c:431
+#, c-format
+msgid "/ on %s"
+msgstr "%s üzerinde /"
+
+#: ../daemon/gvfsbackendarchive.c:785 ../daemon/gvfsbackendburn.c:680
 #: ../daemon/gvfsbackendcomputer.c:714 ../daemon/gvfsbackenddnssd.c:445
-#: ../daemon/gvfsbackendftp.c:206 ../daemon/gvfsbackendnetwork.c:693
-#: ../daemon/gvfsbackendsftp.c:3803 ../daemon/gvfsftpdircache.c:154
+#: ../daemon/gvfsbackendftp.c:351 ../daemon/gvfsbackendnetwork.c:649
+#: ../daemon/gvfsbackendsftp.c:3881 ../daemon/gvfsftpdircache.c:157
 msgid "The file is not a directory"
 msgstr "Dosya bir dizin değil"
 
@@ -352,22 +813,17 @@ msgstr "Geçiçi dizin oluşturulamadı"
 #: ../daemon/gvfsbackendburn.c:451 ../daemon/gvfsbackendburn.c:672
 #: ../daemon/gvfsbackendburn.c:717 ../daemon/gvfsbackendburn.c:743
 #: ../daemon/gvfsbackendburn.c:781 ../daemon/gvfsbackendburn.c:972
-#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:630
-#: ../daemon/gvfsbackendgphoto2.c:1194 ../daemon/gvfsbackendgphoto2.c:2186
-#: ../daemon/gvfsbackendgphoto2.c:2905 ../daemon/gvfsbackendsftp.c:1756
-#: ../daemon/gvfsbackendsftp.c:2869 ../daemon/gvfsbackendsftp.c:2882
-#: ../daemon/gvfsbackendsftp.c:2902 ../daemon/gvfsbackendtrash.c:216
+#: ../daemon/gvfsbackendburn.c:1008 ../daemon/gvfsbackendftp.c:793
+#: ../daemon/gvfsbackendgphoto2.c:1203 ../daemon/gvfsbackendgphoto2.c:2129
+#: ../daemon/gvfsbackendgphoto2.c:2848 ../daemon/gvfsbackendsftp.c:1836
+#: ../daemon/gvfsbackendsftp.c:2949 ../daemon/gvfsbackendsftp.c:2962
+#: ../daemon/gvfsbackendsftp.c:2982 ../daemon/gvfsbackendtrash.c:216
 #, c-format
 msgid "No such file or directory"
 msgstr "Böyle dosya ya da dizin yok"
 
-#: ../daemon/gvfsbackendburn.c:425 ../daemon/gvfsbackenddav.c:2223
-#: ../daemon/gvfsbackendsftp.c:1748
-msgid "Directory not empty"
-msgstr "Dizin boş değil"
-
 #: ../daemon/gvfsbackendburn.c:459 ../daemon/gvfsbackendburn.c:904
-#: ../daemon/gvfsbackendobexftp.c:1791
+#: ../daemon/gvfsbackendobexftp.c:1810
 msgid "Can't copy file over directory"
 msgstr "Dizin üstüne dosya kopyalanamıyor"
 
@@ -379,31 +835,31 @@ msgstr "CD/DVD Oluşturucu"
 #: ../daemon/gvfsbackendburn.c:753 ../daemon/gvfsbackendburn.c:789
 #: ../daemon/gvfsbackendburn.c:924 ../daemon/gvfsbackendburn.c:986
 #: ../daemon/gvfsbackendburn.c:990 ../daemon/gvfsbackendburn.c:1000
-#: ../daemon/gvfsbackendgphoto2.c:2979
+#: ../daemon/gvfsbackendgphoto2.c:2922
 msgid "File exists"
 msgstr "Dosya mevcut"
 
 #: ../daemon/gvfsbackendburn.c:828 ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:169
-#: ../daemon/gvfsjobcreatemonitor.c:140 ../daemon/gvfsjobcreatemonitor.c:151
-#: ../daemon/gvfsjobcreatemonitor.c:174 ../daemon/gvfsjobcreatemonitor.c:192
-#: ../daemon/gvfsjobdelete.c:122 ../daemon/gvfsjobenumerate.c:256
-#: ../daemon/gvfsjobmakedirectory.c:122 ../daemon/gvfsjobmount.c:109
-#: ../daemon/gvfsjobmountmountable.c:156 ../daemon/gvfsjobmove.c:168
-#: ../daemon/gvfsjobopenforread.c:133 ../daemon/gvfsjobopenforwrite.c:151
-#: ../daemon/gvfsjobopenforwrite.c:165 ../daemon/gvfsjobopenforwrite.c:179
-#: ../daemon/gvfsjobopeniconforread.c:120 ../daemon/gvfsjobpollmountable.c:125
-#: ../daemon/gvfsjobpull.c:175 ../daemon/gvfsjobpush.c:175
-#: ../daemon/gvfsjobqueryattributes.c:135 ../daemon/gvfsjobqueryfsinfo.c:131
-#: ../daemon/gvfsjobqueryinfo.c:149 ../daemon/gvfsjobqueryinforead.c:119
+#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:171
+#: ../daemon/gvfsjobcreatemonitor.c:141 ../daemon/gvfsjobcreatemonitor.c:152
+#: ../daemon/gvfsjobcreatemonitor.c:175 ../daemon/gvfsjobcreatemonitor.c:193
+#: ../daemon/gvfsjobdelete.c:123 ../daemon/gvfsjobenumerate.c:257
+#: ../daemon/gvfsjobmakedirectory.c:123 ../daemon/gvfsjobmount.c:109
+#: ../daemon/gvfsjobmountmountable.c:157 ../daemon/gvfsjobmove.c:169
+#: ../daemon/gvfsjobopenforread.c:134 ../daemon/gvfsjobopenforwrite.c:152
+#: ../daemon/gvfsjobopenforwrite.c:166 ../daemon/gvfsjobopenforwrite.c:180
+#: ../daemon/gvfsjobopeniconforread.c:117 ../daemon/gvfsjobpollmountable.c:126
+#: ../daemon/gvfsjobpull.c:176 ../daemon/gvfsjobpush.c:176
+#: ../daemon/gvfsjobqueryattributes.c:136 ../daemon/gvfsjobqueryfsinfo.c:132
+#: ../daemon/gvfsjobqueryinfo.c:150 ../daemon/gvfsjobqueryinforead.c:119
 #: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
 #: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
-#: ../daemon/gvfsjobsetattribute.c:150 ../daemon/gvfsjobsetdisplayname.c:127
-#: ../daemon/gvfsjobstartmountable.c:132 ../daemon/gvfsjobstopmountable.c:135
-#: ../daemon/gvfsjobtrash.c:122 ../daemon/gvfsjobunmountmountable.c:139
-#: ../daemon/gvfsjobunmountmountable.c:154 ../daemon/gvfsjobwrite.c:120
-#: ../monitor/gdu/ggdumount.c:1134 ../monitor/gdu/ggdumount.c:1218
-#: ../monitor/gdu/ggduvolume.c:1525
+#: ../daemon/gvfsjobsetattribute.c:151 ../daemon/gvfsjobsetdisplayname.c:128
+#: ../daemon/gvfsjobstartmountable.c:133 ../daemon/gvfsjobstopmountable.c:136
+#: ../daemon/gvfsjobtrash.c:123 ../daemon/gvfsjobunmountmountable.c:140
+#: ../daemon/gvfsjobunmountmountable.c:155 ../daemon/gvfsjobwrite.c:120
+#: ../monitor/gdu/ggdumount.c:1177 ../monitor/gdu/ggdumount.c:1261
+#: ../monitor/gdu/ggduvolume.c:1617
 msgid "Operation not supported by backend"
 msgstr "Arkayüz tarafından işlem desteklenmiyor"
 
@@ -411,45 +867,47 @@ msgstr "Arkayüz tarafından işlem desteklenmiyor"
 msgid "No such file or directory in target path"
 msgstr "Hedef yolda böyle dosya ya da dizin yoktur"
 
-#: ../daemon/gvfsbackendburn.c:876 ../daemon/gvfsbackendftp.c:1287
-#: ../daemon/gvfsbackendobexftp.c:1760
-msgid "Can't copy directory over directory"
-msgstr "Dizin üstüne dizin kopyalanamıyor"
-
-#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1768
-#: ../daemon/gvfsbackendobexftp.c:1799 ../daemon/gvfsbackendsftp.c:1750
-#: ../daemon/gvfsbackendsftp.c:4365
+#: ../daemon/gvfsbackendburn.c:885 ../daemon/gvfsbackendobexftp.c:1787
+#: ../daemon/gvfsbackendobexftp.c:1818 ../daemon/gvfsbackendsftp.c:1830
+#: ../daemon/gvfsbackendsftp.c:4441
 msgid "Target file exists"
 msgstr "Hedef dosya mevcut"
 
-#: ../daemon/gvfsbackendburn.c:892 ../daemon/gvfsbackendftp.c:1310
-#: ../daemon/gvfsbackendobexftp.c:1775
-msgid "Can't recursively copy directory"
-msgstr "Dizin iç içe kopyalanamıyor"
-
 #: ../daemon/gvfsbackendburn.c:950 ../daemon/gvfsbackendcomputer.c:794
-#: ../daemon/gvfsbackendgphoto2.c:2559 ../daemon/gvfsbackendgphoto2.c:2768
-#: ../daemon/gvfsbackendgphoto2.c:2865 ../daemon/gvfsbackendgphoto2.c:2958
+#: ../daemon/gvfsbackendgphoto2.c:2502 ../daemon/gvfsbackendgphoto2.c:2711
+#: ../daemon/gvfsbackendgphoto2.c:2808 ../daemon/gvfsbackendgphoto2.c:2901
 msgid "Not supported"
 msgstr "Desteklenmiyor"
 
-#: ../daemon/gvfsbackendcdda.c:333 ../daemon/gvfsbackendgphoto2.c:1496
+#: ../daemon/gvfsbackend.c:962 ../monitor/gdu/ggdumount.c:925
+msgid "Unmount Anyway"
+msgstr "Gene de Bağı Kes"
+
+#: ../daemon/gvfsbackend.c:965 ../monitor/gdu/ggdumount.c:927
+msgid ""
+"Volume is busy\n"
+"One or more applications are keeping the volume busy."
+msgstr ""
+"Birim meşgul\n"
+"Bir ya da daha fazla uygulama birimi meşgul tutuyor."
+
+#: ../daemon/gvfsbackendcdda.c:332 ../daemon/gvfsbackendgphoto2.c:1506
 msgid "Cannot create gudev client"
 msgstr "gudev istemcisi oluşturulamıyor"
 
-#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1514
+#: ../daemon/gvfsbackendcdda.c:352 ../daemon/gvfsbackendgphoto2.c:1524
 msgid "Cannot connect to the system bus"
 msgstr "Sistem veri yoluna bağlanılamıyor"
 
-#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1526
+#: ../daemon/gvfsbackendcdda.c:363 ../daemon/gvfsbackendgphoto2.c:1536
 msgid "Cannot create libhal context"
 msgstr "Libhal bağlamı oluşturulamıyor"
 
-#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1539
+#: ../daemon/gvfsbackendcdda.c:377 ../daemon/gvfsbackendgphoto2.c:1549
 msgid "Cannot initialize libhal"
 msgstr "Libhal başlatılamıyor"
 
-#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:477
+#: ../daemon/gvfsbackendcdda.c:393 ../daemon/gvfsbackendcdda.c:478
 msgid "No drive specified"
 msgstr "Sürücü belirtilmemiş"
 
@@ -463,52 +921,53 @@ msgstr "%s sürücüsü bulunamıyor"
 msgid "Drive %s does not contain audio files"
 msgstr "Sürücü %s ses dosyaları içermiyor"
 
-#. Translator: %s is the device the disc is inserted into
-#: ../daemon/gvfsbackendcdda.c:439
+#. Translator: %s is the device the disc is inserted into. 'cdda' is the name
+#. name of the backend and shouldn't be translated.
+#: ../daemon/gvfsbackendcdda.c:440
 #, c-format
 msgid "cdda mount on %s"
 msgstr "cdda bağı %s üzerinde"
 
-#: ../daemon/gvfsbackendcdda.c:440 ../daemon/gvfsbackendcdda.c:960
-#: ../monitor/gdu/ggduvolume.c:320 ../monitor/hal/ghalmount.c:325
+#: ../daemon/gvfsbackendcdda.c:441 ../daemon/gvfsbackendcdda.c:961
+#: ../monitor/gdu/ggduvolume.c:349 ../monitor/hal/ghalmount.c:325
 #: ../monitor/hal/ghalvolume.c:225 ../monitor/hal/ghalvolume.c:246
 #, c-format
 msgid "Audio Disc"
 msgstr "Ses Diski"
 
-#: ../daemon/gvfsbackendcdda.c:503
+#: ../daemon/gvfsbackendcdda.c:504
 #, c-format
 msgid "File system is busy: %d open file"
 msgid_plural "File system is busy: %d open files"
 msgstr[0] "Dosya sistemi meşgul: %d açık dosya"
 
-#: ../daemon/gvfsbackendcdda.c:695
+#: ../daemon/gvfsbackendcdda.c:696
 #, c-format
 msgid "No such file %s on drive %s"
 msgstr "%2$s sürücüsü üzerinde %1$s dosyası yok"
 
 #. Translators: paranoia is the name of the cd audio reading library
-#: ../daemon/gvfsbackendcdda.c:804
+#: ../daemon/gvfsbackendcdda.c:805
 #, c-format
 msgid "Error from 'paranoia' on drive %s"
 msgstr "%s sürücüsünde 'paranoia' kaynaklı hata oluştu"
 
-#: ../daemon/gvfsbackendcdda.c:867
+#: ../daemon/gvfsbackendcdda.c:868
 #, c-format
 msgid "Error seeking in stream on drive %s"
 msgstr "%s sürücüsünde akışta atlama hatası"
 
-#: ../daemon/gvfsbackendcdda.c:979 ../daemon/gvfsbackendgphoto2.c:1873
+#: ../daemon/gvfsbackendcdda.c:980 ../daemon/gvfsbackendgphoto2.c:1816
 #, c-format
 msgid "No such file"
 msgstr "Böyle dosya yok"
 
-#: ../daemon/gvfsbackendcdda.c:993
+#: ../daemon/gvfsbackendcdda.c:994
 #, c-format
 msgid "The file does not exist or isn't an audio track"
 msgstr "Dosya mevcut değil ya da bir ses parçası değil"
 
-#: ../daemon/gvfsbackendcdda.c:1099
+#: ../daemon/gvfsbackendcdda.c:1100
 msgid "Audio CD Filesystem Service"
 msgstr "Ses CD'si Dosya Sistemi Servisi"
 
@@ -517,14 +976,15 @@ msgid "Computer"
 msgstr "Bilgisayar"
 
 #: ../daemon/gvfsbackendcomputer.c:521
-msgid "Filesystem"
-msgstr "Dosya sistemi"
+#| msgid "Filesystem"
+msgid "File System"
+msgstr "Dosya Sistemi"
 
 #: ../daemon/gvfsbackendcomputer.c:649
 msgid "Can't open mountable file"
 msgstr "Bağlanılabilir dosya açılamıyor"
 
-#: ../daemon/gvfsbackendcomputer.c:840 ../daemon/gvfsbackendsftp.c:1146
+#: ../daemon/gvfsbackendcomputer.c:840 ../daemon/gvfsbackendsftp.c:1163
 #, c-format
 msgid "Internal error: %s"
 msgstr "Dahili hata: %s"
@@ -534,8 +994,9 @@ msgid "Can't mount file"
 msgstr "Dosya bağlanamıyor"
 
 #: ../daemon/gvfsbackendcomputer.c:884
-msgid "No media in the drive"
-msgstr "Sürücüde hiçbir ortam bulunamadı"
+#| msgid "No media in the drive"
+msgid "No medium in the drive"
+msgstr "Sürücüde hiçbir ortam yok"
 
 #: ../daemon/gvfsbackendcomputer.c:941 ../daemon/gvfsbackendcomputer.c:1036
 #: ../daemon/gvfsbackendcomputer.c:1142 ../daemon/gvfsbackendcomputer.c:1232
@@ -563,78 +1024,80 @@ msgstr "Dosya durdurulamıyor"
 msgid "Can't poll file"
 msgstr "Dosya yoklanamıyor"
 
-#: ../daemon/gvfsbackenddav.c:561 ../daemon/gvfsbackenddav.c:1698
-#: ../daemon/gvfsbackendhttp.c:252
+#. Translators: This is the name of the WebDAV share constructed as
+#. "WebDAV as <username> on <hostname>:<port>"; the ":<port>" part is
+#. the second %s and only shown if it is not the default http(s) port.
+#: ../daemon/gvfsbackenddav.c:485
+#, c-format
+#| msgid "WebDAV on %s"
+msgid "WebDAV as %s on %s%s"
+msgstr "%2$s%3$s üzerinde %1$s olarak 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"
+msgid "WebDAV on %s%s"
+msgstr "%s%s üzerinde WebDAV"
+
+#: ../daemon/gvfsbackenddav.c:668 ../daemon/gvfsbackenddav.c:1864
+#: ../daemon/gvfsbackendhttp.c:255
 #, c-format
 msgid "HTTP Error: %s"
 msgstr "HTTP Hatası: %s"
 
-#: ../daemon/gvfsbackenddav.c:578
+#: ../daemon/gvfsbackenddav.c:685
 msgid "Could not parse response"
 msgstr "Cevap ayrıştırılamadı"
 
-#: ../daemon/gvfsbackenddav.c:587
+#: ../daemon/gvfsbackenddav.c:694
 msgid "Empty response"
 msgstr "Boş cevap"
 
-#: ../daemon/gvfsbackenddav.c:595
+#: ../daemon/gvfsbackenddav.c:702
 msgid "Unexpected reply from server"
 msgstr "Sunucudan beklenilmeyen yanıt"
 
-#: ../daemon/gvfsbackenddav.c:1214 ../daemon/gvfsbackenddav.c:1838
+#: ../daemon/gvfsbackenddav.c:1373 ../daemon/gvfsbackenddav.c:1999
+#: ../daemon/gvfsbackenddav.c:2086 ../daemon/gvfsbackenddav.c:2193
 msgid "Response invalid"
 msgstr "Geçersiz cevap"
 
-#: ../daemon/gvfsbackenddav.c:1357
+#: ../daemon/gvfsbackenddav.c:1516
 msgid "WebDAV share"
 msgstr "WebDAV paylaşımı"
 
-#: ../daemon/gvfsbackenddav.c:1359
+#: ../daemon/gvfsbackenddav.c:1518
 #, c-format
 msgid "Enter password for %s"
 msgstr "%s için parolayı girin"
 
-#: ../daemon/gvfsbackenddav.c:1362
+#: ../daemon/gvfsbackenddav.c:1521
 msgid "Please enter proxy password"
 msgstr "Lütfen vekil sunucu parolasını girin"
 
-#: ../daemon/gvfsbackenddav.c:1702 ../daemon/gvfsbackenddav.c:1706
+#: ../daemon/gvfsbackenddav.c:1868 ../daemon/gvfsbackenddav.c:1872
 msgid "Not a WebDAV enabled share"
 msgstr "Paylaşımı etkinleştirilmiş bir WebDAV yok"
 
-#: ../daemon/gvfsbackenddav.c:1734
-#, c-format
-msgid "WebDAV on %s"
-msgstr "WebDAV %s üzerinde"
-
-#: ../daemon/gvfsbackenddav.c:1794 ../daemon/gvfsbackenddav.c:1867
+#: ../daemon/gvfsbackenddav.c:1953 ../daemon/gvfsbackenddav.c:2041
+#: ../daemon/gvfsbackenddav.c:2114 ../daemon/gvfsbackenddav.c:2227
 msgid "Could not create request"
 msgstr "İstek oluşturulamadı"
 
-#: ../daemon/gvfsbackenddav.c:1930 ../daemon/gvfsbackenddav.c:2183
-#: ../daemon/gvfsbackenddav.c:2294 ../daemon/gvfsbackendftp.c:589
-#: ../daemon/gvfsbackendftp.c:770 ../daemon/gvfsbackendftp.c:1120
-#: ../daemon/gvfsbackendftp.c:1295 ../daemon/gvfsbackendsftp.c:4209
-#: ../daemon/gvfsbackendsmb.c:2001
-msgid "Target file already exists"
-msgstr "Hedef dosya zaten mevcut"
-
-#: ../daemon/gvfsbackenddav.c:2003 ../daemon/gvfsbackendsftp.c:3343
-#: ../daemon/gvfsbackendsmb.c:1132
-msgid "The file was externally modified"
-msgstr "Dosya harici olarak değiştirilmiş"
-
-#: ../daemon/gvfsbackenddav.c:2034 ../daemon/gvfsbackendsmb.c:1168
-#: ../daemon/gvfsbackendsmb.c:2018
+#: ../daemon/gvfsbackenddav.c:2361 ../daemon/gvfsbackendsmb.c:1184
+#: ../daemon/gvfsbackendsmb.c:2099
 msgid "Backup file creation failed"
 msgstr "Yedek dosyası oluşturma başarısız oldu"
 
 #. "separate": a link to dns-sd://local/
-#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:393
+#: ../daemon/gvfsbackenddnssd.c:492 ../daemon/gvfsbackendnetwork.c:371
 msgid "Local Network"
 msgstr "Yerel Ağ"
 
-#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:797
+#: ../daemon/gvfsbackenddnssd.c:736 ../daemon/gvfsbackendnetwork.c:753
 msgid "Can't monitor file or directory."
 msgstr "Dosya ya da dizin izlenemiyor."
 
@@ -643,87 +1106,71 @@ msgstr "Dosya ya da dizin izlenemiyor."
 msgid "Dns-SD"
 msgstr "Dns-SD"
 
-#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:732
-#: ../daemon/gvfsbackendnetwork.c:882 ../daemon/gvfsbackendnetwork.c:883
+#: ../daemon/gvfsbackenddnssd.c:755 ../daemon/gvfsbackendnetwork.c:688
+#: ../daemon/gvfsbackendnetwork.c:820 ../daemon/gvfsbackendnetwork.c:821
 msgid "Network"
 msgstr "Ağ"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:329
+#: ../daemon/gvfsbackendftp.c:488
 #, c-format
-msgid "Enter password for ftp as %s on %s"
-msgstr "%2$s üzerindeki %1$s olarak ftp için parola girin"
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter password for FTP as %s on %s"
+msgstr "%2$s üzerindeki %1$s için FTP parolasını girin"
 
 #. translators: %s here is the hostname
-#: ../daemon/gvfsbackendftp.c:332
+#: ../daemon/gvfsbackendftp.c:491
 #, c-format
-msgid "Enter password for ftp on %s"
-msgstr "%s üzerindeki ftp için parola girin"
-
-#: ../daemon/gvfsbackendftp.c:358 ../daemon/gvfsbackendsftp.c:969
-#: ../daemon/gvfsbackendsmb.c:606 ../daemon/gvfsbackendsmbbrowse.c:986
-msgid "Password dialog cancelled"
-msgstr "Parola penceresi iptal edildi"
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for FTP on %s"
+msgstr "%s üzerindeki FTP parolasını girin"
 
-#: ../daemon/gvfsbackendftp.c:467
+#: ../daemon/gvfsbackendftp.c:630
 #, c-format
-msgid "ftp on %s"
-msgstr "%s üzerinde ftp"
+#| msgid "/ on %s"
+msgid "FTP on %s"
+msgstr "%s üzerinde FTP"
 
 #. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:471
+#: ../daemon/gvfsbackendftp.c:634
 #, c-format
-msgid "ftp as %s on %s"
-msgstr "%s olarak %s üzerinde ftp"
+#| msgid "ftp as %s on %s"
+msgid "FTP as %s on %s"
+msgstr "%2$s üzerinde %1$s olarak FTP"
 
-#: ../daemon/gvfsbackendftp.c:564
+#: ../daemon/gvfsbackendftp.c:727
 msgid "Insufficient permissions"
 msgstr "Yetersiz izinler"
 
-#: ../daemon/gvfsbackendftp.c:573
-msgid "File does not exist"
-msgstr "Dosya mevcut değil"
-
-#: ../daemon/gvfsbackendftp.c:610 ../daemon/gvfsbackendsftp.c:2253
-#: ../daemon/gvfsbackendsftp.c:2989 ../daemon/gvfsbackendsftp.c:3330
-#: ../daemon/gvfsbackendsftp.c:4200
-msgid "File is directory"
-msgstr "Dosya bir dizin"
-
-#: ../daemon/gvfsbackendftp.c:818 ../daemon/gvfsbackendftp.c:1083
-#: ../daemon/gvfsbackendsftp.c:3196
-msgid "backups not supported yet"
-msgstr "yedekler henüz desteklenmiyor"
-
-#: ../daemon/gvfsbackendgphoto2.c:504
+#: ../daemon/gvfsbackendgphoto2.c:506
 #, c-format
 msgid "%s: %d: Directory or file exists"
 msgstr "%s: %d: Dizin ya da dosya mevcut"
 
-#: ../daemon/gvfsbackendgphoto2.c:511
+#: ../daemon/gvfsbackendgphoto2.c:513
 #, c-format
 msgid "%s: %d: No such file or directory"
 msgstr "%s: %d: Böyle bir dosya ya da dizin yok"
 
-#: ../daemon/gvfsbackendgphoto2.c:517
+#: ../daemon/gvfsbackendgphoto2.c:519
 #, c-format
 msgid "%s: %d: Invalid filename"
 msgstr "%s: %d: Geçersiz dosya ismi"
 
-#: ../daemon/gvfsbackendgphoto2.c:523
+#: ../daemon/gvfsbackendgphoto2.c:525
 #, c-format
 msgid "%s: %d: Not Supported"
 msgstr "%s: %d: Desteklenmiyor"
 
 #. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:718 ../daemon/gvfsbackendgphoto2.c:724
+#: ../daemon/gvfsbackendgphoto2.c:716 ../daemon/gvfsbackendgphoto2.c:722
 #, c-format
 msgid "Digital Camera (%s)"
 msgstr "Dijital Fotoğraf Makinesi (%s)"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:936 ../monitor/gphoto2/ggphoto2volume.c:240
+#: ../daemon/gvfsbackendgphoto2.c:945 ../monitor/gphoto2/ggphoto2volume.c:197
 #: ../monitor/gphoto2/ggphoto2volume.c:299
 #, c-format
 msgid "%s Camera"
@@ -731,194 +1178,195 @@ msgstr "%s Fotoğraf Makinası"
 
 #. Translator: %s is the vendor name, e.g. Panasonic
 #. Translators: %s is the device vendor
-#: ../daemon/gvfsbackendgphoto2.c:939 ../monitor/gphoto2/ggphoto2volume.c:235
+#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:192
 #: ../monitor/gphoto2/ggphoto2volume.c:294
 #, c-format
 msgid "%s Audio Player"
 msgstr "%s Ses Çalıcısı"
 
-#: ../daemon/gvfsbackendgphoto2.c:948 ../monitor/gphoto2/ggphoto2volume.c:246
+#: ../daemon/gvfsbackendgphoto2.c:957 ../monitor/gphoto2/ggphoto2volume.c:203
 #: ../monitor/gphoto2/ggphoto2volume.c:308
 msgid "Camera"
 msgstr "Fotoğraf Makinası"
 
-#: ../daemon/gvfsbackendgphoto2.c:950 ../monitor/gphoto2/ggphoto2volume.c:306
+#: ../daemon/gvfsbackendgphoto2.c:959 ../monitor/gphoto2/ggphoto2volume.c:306
 msgid "Audio Player"
 msgstr "Ses Çalıcısı"
 
-#: ../daemon/gvfsbackendgphoto2.c:1555
+#: ../daemon/gvfsbackendgphoto2.c:1565
 msgid "No device specified"
 msgstr "Hiçbir aygıt belirtilmedi"
 
-#: ../daemon/gvfsbackendgphoto2.c:1576
+#: ../daemon/gvfsbackendgphoto2.c:1586
 msgid "Cannot create gphoto2 context"
 msgstr "gphoto2 bağlamı oluşturulamıyor"
 
-#: ../daemon/gvfsbackendgphoto2.c:1586
+#: ../daemon/gvfsbackendgphoto2.c:1596
 msgid "Error creating camera"
 msgstr "Fotograf makinesi oluşturulurken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1599 ../daemon/gvfsbackendgphoto2.c:1609
+#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1619
 msgid "Error loading device information"
 msgstr "Aygıt bilgisi yüklenirken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1621
+#: ../daemon/gvfsbackendgphoto2.c:1631
 msgid "Error looking up device information"
 msgstr "Aygıt bilgisine bakılırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1631
+#: ../daemon/gvfsbackendgphoto2.c:1641
 msgid "Error getting device information"
 msgstr "Aygıt bilgisi alınırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1644
+#: ../daemon/gvfsbackendgphoto2.c:1654
 msgid "Error setting up camera communications port"
 msgstr "Fotograf makinesi iletişim portu ayarlanırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1655
+#: ../daemon/gvfsbackendgphoto2.c:1665
 msgid "Error initializing camera"
 msgstr "Fotograf makinesi başlatılırken hata"
 
-#. Translator: %s represents the device, e.g. usb:001,042
-#: ../daemon/gvfsbackendgphoto2.c:1669
+#. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the
+#. backend and shouldn't be translated.
+#: ../daemon/gvfsbackendgphoto2.c:1680
 #, c-format
 msgid "gphoto2 mount on %s"
 msgstr "gphoto2 bağı %s üzerinde"
 
-#: ../daemon/gvfsbackendgphoto2.c:1744
+#: ../daemon/gvfsbackendgphoto2.c:1762
 msgid "No camera specified"
 msgstr "Hiçbir fotograf makinesi belirtilmedi"
 
-#: ../daemon/gvfsbackendgphoto2.c:1785 ../daemon/gvfsbackendgphoto2.c:1811
-#, c-format
-msgid "Filesystem is busy"
-msgstr "Dosya sistemi meşgul"
-
-#: ../daemon/gvfsbackendgphoto2.c:1881
+#: ../daemon/gvfsbackendgphoto2.c:1824
 msgid "Error creating file object"
 msgstr "Dosya nesnesi oluşturulurken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1896
+#: ../daemon/gvfsbackendgphoto2.c:1839
 msgid "Error getting file"
 msgstr "Dosya alınırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1906
+#: ../daemon/gvfsbackendgphoto2.c:1849
 msgid "Error getting data from file"
 msgstr "Dosyadan veri alınırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:1964
+#: ../daemon/gvfsbackendgphoto2.c:1907
 #, c-format
 msgid "Malformed icon identifier '%s'"
 msgstr "Bozuk simge belirteci '%s'"
 
-#: ../daemon/gvfsbackendgphoto2.c:2040 ../daemon/gvfsbackendgphoto2.c:3229
+#: ../daemon/gvfsbackendgphoto2.c:1983 ../daemon/gvfsbackendgphoto2.c:3172
 #, c-format
 msgid "Error seeking in stream on camera %s"
 msgstr "Fotograf makinesi %s üzerinde akış içine atlanırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:2180 ../daemon/gvfsbackendsftp.c:2872
-#: ../daemon/gvfsbackendsmbbrowse.c:1390
+#: ../daemon/gvfsbackendgphoto2.c:2123 ../daemon/gvfsbackendsftp.c:2952
+#: ../daemon/gvfsbackendsmbbrowse.c:1399
 msgid "Not a directory"
 msgstr "Bir dizin değil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2213
+#: ../daemon/gvfsbackendgphoto2.c:2156
 msgid "Failed to get folder list"
 msgstr "Klasör listesi alma başarısız oldu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2279
+#: ../daemon/gvfsbackendgphoto2.c:2222
 msgid "Failed to get file list"
 msgstr "Dosya listesi alınırken başarısız olundu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2571
+#: ../daemon/gvfsbackendgphoto2.c:2514
 msgid "Error creating directory"
 msgstr "Dizin oluşturuken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:2780
+#: ../daemon/gvfsbackendgphoto2.c:2723
 msgid "Name already exists"
 msgstr "İsim zaten mevcut"
 
-#: ../daemon/gvfsbackendgphoto2.c:2791 ../daemon/gvfsbackendgphoto2.c:3420
+#: ../daemon/gvfsbackendgphoto2.c:2734 ../daemon/gvfsbackendgphoto2.c:3363
 msgid "New name too long"
 msgstr "Yeni isim çok uzun"
 
-#: ../daemon/gvfsbackendgphoto2.c:2801 ../daemon/gvfsbackendgphoto2.c:3431
-msgid "Error renaming dir"
-msgstr "Dizin tekrar adlandırılırken hata"
+#: ../daemon/gvfsbackendgphoto2.c:2744 ../daemon/gvfsbackendgphoto2.c:3374
+#| msgid "Error creating directory"
+msgid "Error renaming directory"
+msgstr "Dizinin adı değiştirilirken hata oluştu"
 
-#: ../daemon/gvfsbackendgphoto2.c:2814 ../daemon/gvfsbackendgphoto2.c:3444
+#: ../daemon/gvfsbackendgphoto2.c:2757 ../daemon/gvfsbackendgphoto2.c:3387
 msgid "Error renaming file"
 msgstr "Dosya yeniden adlandırılırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:2878
+#: ../daemon/gvfsbackendgphoto2.c:2821
 #, c-format
 msgid "Directory '%s' is not empty"
 msgstr "Dizin '%s' boş değil"
 
-#: ../daemon/gvfsbackendgphoto2.c:2889
+#: ../daemon/gvfsbackendgphoto2.c:2832
 msgid "Error deleting directory"
 msgstr "Dizin silinirken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:2915
+#: ../daemon/gvfsbackendgphoto2.c:2858
 msgid "Error deleting file"
 msgstr "Dosya silinirken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:2968
+#: ../daemon/gvfsbackendgphoto2.c:2911
 msgid "Can't write to directory"
 msgstr "Dizine yazılamıyor"
 
-#: ../daemon/gvfsbackendgphoto2.c:3015
+#: ../daemon/gvfsbackendgphoto2.c:2958
 msgid "Cannot allocate new file to append to"
 msgstr "Sonuna eklemek için yeni dosya ayrılamıyor"
 
-#: ../daemon/gvfsbackendgphoto2.c:3030
+#: ../daemon/gvfsbackendgphoto2.c:2973
 msgid "Cannot read file to append to"
 msgstr "Sonuna eklemek için dosya okunamıyor"
 
-#: ../daemon/gvfsbackendgphoto2.c:3041
+#: ../daemon/gvfsbackendgphoto2.c:2984
 msgid "Cannot get data of file to append to"
 msgstr "Sonuna eklemek için dosyanın verisi alınamıyor"
 
-#: ../daemon/gvfsbackendgphoto2.c:3328
+#: ../daemon/gvfsbackendgphoto2.c:3271
 msgid "Error writing file"
 msgstr "Dosyaya yazılırken hata"
 
-#: ../daemon/gvfsbackendgphoto2.c:3376
+#: ../daemon/gvfsbackendgphoto2.c:3319
 msgid "Not supported (not same directory)"
 msgstr "Desteklenmiyor (aynı dizin değil)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3388
-msgid "Not supported (src is dir, dst is dir)"
-msgstr "Desteklenmiyor (src bir dizin, dst bir dizin)"
+#: ../daemon/gvfsbackendgphoto2.c:3331
+#| msgid "Not supported (src is dir, dst is dir)"
+msgid ""
+"Not supported (the source is a directory, the destination is a directory too)"
+msgstr "Desteklenmiyor (kaynak bir dizin, hedef de bir dizin)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3396
-msgid "Not supported (src is dir, dst is existing file)"
-msgstr "Desteklenmiyor (src bir dizin, dst mevcut bir dosya)"
+#: ../daemon/gvfsbackendgphoto2.c:3339
+#| msgid "Not supported (src is dir, dst is existing file)"
+msgid ""
+"Not supported (the source is a directory, but the destination is an existing "
+"file)"
+msgstr ""
+"Desteklenmiyor (kaynak bir dizin, ama hedef mevcut bir "
+"dosya)"
 
-#: ../daemon/gvfsbackendgphoto2.c:3408
-msgid "Not supported (src is file, dst is dir)"
-msgstr "Desteklenmiyor (src bir dosya, dst bir dizin)"
+#: ../daemon/gvfsbackendgphoto2.c:3351
+#| msgid "Not supported (src is file, dst is dir)"
+msgid ""
+"Not supported (the source is a file, but the destination is a directory)"
+msgstr "Desteklenmiyor (kaynak bir dosya, ama hedef bir dizin)"
 
-#: ../daemon/gvfsbackendhttp.c:248
+#: ../daemon/gvfsbackendhttp.c:251
 #, c-format
 msgid "HTTP Client Error: %s"
 msgstr "HTTP İstemci Hatası: %s"
 
-#: ../daemon/gvfsbackendhttp.c:570 ../daemon/gvfsbackendsftp.c:2177
-#: ../daemon/gvfsbackendsmb.c:1424 ../daemon/gvfsdaemonutils.c:211
-msgid " (invalid encoding)"
-msgstr ".(geçersiz kodlama)"
-
 #: ../daemon/gvfsbackendlocaltest.c:855
 msgid "Directory notification not supported"
 msgstr "Dizin bildirimi desteklenmiyor"
 
 #. smb:/// root link
-#: ../daemon/gvfsbackendnetwork.c:269 ../daemon/gvfsbackendsmbbrowse.c:885
+#: ../daemon/gvfsbackendnetwork.c:247 ../daemon/gvfsbackendsmbbrowse.c:894
 msgid "Windows Network"
 msgstr "Windows Ağı"
 
 #. Translators: this is the friendly name of the 'network://' backend that
 #. * shows computers in your local network.
-#: ../daemon/gvfsbackendnetwork.c:931
+#: ../daemon/gvfsbackendnetwork.c:873
 msgid "Network Location Monitor"
 msgstr "Ağ Konum İzleyici"
 
@@ -928,83 +1376,104 @@ msgstr "Ağ Konum İzleyici"
 #. 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:662 ../daemon/gvfsbackendsmb.c:545
-#: ../daemon/gvfsbackendsmb.c:1417
+#: ../daemon/gvfsbackendobexftp.c:682 ../daemon/gvfsbackendsmb.c:554
+#: ../daemon/gvfsbackendsmb.c:1433
 #, c-format
 msgid "%s on %s"
 msgstr "%2$s üzerinde %1$s"
 
-#: ../daemon/gvfsbackendobexftp.c:871
+#: ../daemon/gvfsbackendobexftp.c:891
 msgid "USB support missing. Please contact your software vendor"
 msgstr "USB desteği eksik. Lütfen yazılım üreticinizle bağlantıya geçin"
 
-#: ../daemon/gvfsbackendobexftp.c:991
+#: ../daemon/gvfsbackendobexftp.c:1010
 msgid "Connection to the device lost"
 msgstr "Aygıtla bağlantı kayboldu"
 
-#: ../daemon/gvfsbackendobexftp.c:1488
+#: ../daemon/gvfsbackendobexftp.c:1507
 msgid "Device requires a software update"
 msgstr "Aygıt yazılım güncellemesi gerektiriyor"
 
-#: ../daemon/gvfsbackendsftp.c:295 ../daemon/gvfsbackendsftp.c:651
+#: ../daemon/gvfsbackendobexftp.c:1855 ../daemon/gvfsbackendsmb.c:1973
+#, c-format
+msgid "Error deleting file: %s"
+msgstr "Dosya silinirken hata: %s"
+
+#: ../daemon/gvfsbackendsftp.c:302 ../daemon/gvfsbackendsftp.c:658
 msgid "ssh program unexpectedly exited"
 msgstr "ssh programından beklenilmeyen çıkış"
 
-#: ../daemon/gvfsbackendsftp.c:303 ../daemon/gvfsbackendsftp.c:1754
-#: ../daemon/gvfsftptask.c:391
-msgid "Permission denied"
-msgstr "İzin verilmedi"
-
-#: ../daemon/gvfsbackendsftp.c:310
+#: ../daemon/gvfsbackendsftp.c:317
 msgid "Hostname not known"
 msgstr "Makine adı bilinmiyor"
 
-#: ../daemon/gvfsbackendsftp.c:317
+#: ../daemon/gvfsbackendsftp.c:324
 msgid "No route to host"
 msgstr "Makineye ulaşılamıyor"
 
-#: ../daemon/gvfsbackendsftp.c:324
+#: ../daemon/gvfsbackendsftp.c:331
 msgid "Connection refused by server"
 msgstr "Bağlantı sunucu tarafından reddedildi"
 
-#: ../daemon/gvfsbackendsftp.c:331
+#: ../daemon/gvfsbackendsftp.c:338
 msgid "Host key verification failed"
 msgstr "Makine anahtarının onaylanması başarısız oldu"
 
-#: ../daemon/gvfsbackendsftp.c:495
+#: ../daemon/gvfsbackendsftp.c:502
 msgid "Unable to spawn ssh program"
 msgstr "ssh programı yeniden başlatılamadı"
 
-#: ../daemon/gvfsbackendsftp.c:511
+#: ../daemon/gvfsbackendsftp.c:518
 #, c-format
 msgid "Unable to spawn ssh program: %s"
 msgstr "ssh programı yeniden başlatılamadı: %s"
 
-#: ../daemon/gvfsbackendsftp.c:613 ../daemon/gvfsbackendsftp.c:874
+#: ../daemon/gvfsbackendsftp.c:620 ../daemon/gvfsbackendsftp.c:878
 msgid "Timed out when logging in"
 msgstr "Giriş yapılırken zaman aşımına uğradı"
 
-#: ../daemon/gvfsbackendsftp.c:953
-msgid "Enter passphrase for key"
-msgstr "Anahtar için parola metnini girin"
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:958
+#, c-format
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter passphrase for key for ssh as %s on %s"
+msgstr ""
+"%2$s üzerindeki %1$s olarak ssh bağlantısı için anahtar parolasını girin"
+
+#. Translators: the first %s is the username, the second the host name
+#: ../daemon/gvfsbackendsftp.c:961
+#, c-format
+#| msgid "Enter password for ftp as %s on %s"
+msgid "Enter password for ssh as %s on %s"
+msgstr "%2$s üzerindeki %1$s olarak giriş için ssh parolasını giriniz"
+
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:965
+#, c-format
+#| msgid "Enter passphrase for key"
+msgid "Enter passphrase for key for ssh on %s"
+msgstr "%s üzerinde ssh için anahtar parolasını girin"
 
-#: ../daemon/gvfsbackendsftp.c:955
-msgid "Enter password"
-msgstr "Parolayı girin"
+#. Translators: %s is the hostname
+#: ../daemon/gvfsbackendsftp.c:968
+#, c-format
+#| msgid "Enter password for ftp on %s"
+msgid "Enter password for ssh on %s"
+msgstr "%s üzerinde ssh için parola girin"
 
-#: ../daemon/gvfsbackendsftp.c:1031
+#: ../daemon/gvfsbackendsftp.c:1048
 msgid "Can't send password"
 msgstr "Parola gönderilemiyor"
 
-#: ../daemon/gvfsbackendsftp.c:1039
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Log In Anyway"
 msgstr "Gene de Giriş Yap"
 
-#: ../daemon/gvfsbackendsftp.c:1039
+#: ../daemon/gvfsbackendsftp.c:1056
 msgid "Cancel Login"
 msgstr "Girişi İptal Et"
 
-#: ../daemon/gvfsbackendsftp.c:1048
+#: ../daemon/gvfsbackendsftp.c:1065
 #, c-format
 msgid ""
 "The identity of the remote computer (%s) is unknown.\n"
@@ -1020,160 +1489,159 @@ msgstr ""
 "güvenli olduğundan emin olmak istiyorsanız, sistem yöneticinizle bağlantıya "
 "geçin."
 
-#: ../daemon/gvfsbackendsftp.c:1068
+#: ../daemon/gvfsbackendsftp.c:1085
 msgid "Login dialog cancelled"
 msgstr "Giriş penceresi iptal edildi"
 
-#: ../daemon/gvfsbackendsftp.c:1088
+#: ../daemon/gvfsbackendsftp.c:1105
 msgid "Can't send host identity confirmation"
 msgstr "Makine kimlik onayı gönderilemiyor"
 
-#: ../daemon/gvfsbackendsftp.c:1581 ../daemon/gvfsbackendsftp.c:1604
+#: ../daemon/gvfsbackendsftp.c:1643 ../daemon/gvfsbackendsftp.c:1666
 msgid "Protocol error"
 msgstr "Protokol hatası"
 
-#. Translators: This is the name of an sftp share, like "sftp for <user>on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1629
+#. Translators: This is the name of an SFTP share, like "SFTP for <user> on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1691
 #, c-format
-msgid "sftp for %s on %s"
-msgstr "%2$s üzerindeki %1$s için sftp"
+#| msgid "sftp for %s on %s"
+msgid "SFTP for %s on %s"
+msgstr "%2$s üzerinde %1$s için SFTP"
 
-#. Translators: This is the name of an sftp share, like "sftp on <hostname>"
-#: ../daemon/gvfsbackendsftp.c:1632
+#. Translators: This is the name of an SFTP share, like "SFTP on <hostname>"
+#: ../daemon/gvfsbackendsftp.c:1694
 #, c-format
-msgid "sftp on %s"
-msgstr "%s üzerinde sftp"
+#| msgid "/ on %s"
+msgid "SFTP on %s"
+msgstr "%s üzerinde SFTP"
 
-#: ../daemon/gvfsbackendsftp.c:1670
+#: ../daemon/gvfsbackendsftp.c:1735
 msgid "Unable to find supported ssh command"
 msgstr "Desteknelen ssh komut komutu bulunamadı"
 
-#: ../daemon/gvfsbackendsftp.c:1752 ../daemon/gvfsbackendsftp.c:4557
-#: ../daemon/gvfsbackendsmb.c:1665 ../daemon/gvfsftptask.c:383
-msgid "Operation unsupported"
-msgstr "İşlem desteklenmiyor"
-
-#: ../daemon/gvfsbackendsftp.c:1929 ../daemon/gvfsbackendsftp.c:2318
-#: ../daemon/gvfsbackendsftp.c:2397 ../daemon/gvfsbackendsftp.c:2408
-#: ../daemon/gvfsbackendsftp.c:2464 ../daemon/gvfsbackendsftp.c:2550
-#: ../daemon/gvfsbackendsftp.c:2600 ../daemon/gvfsbackendsftp.c:2646
-#: ../daemon/gvfsbackendsftp.c:2721 ../daemon/gvfsbackendsftp.c:2828
-#: ../daemon/gvfsbackendsftp.c:2945 ../daemon/gvfsbackendsftp.c:3026
-#: ../daemon/gvfsbackendsftp.c:3098 ../daemon/gvfsbackendsftp.c:3110
-#: ../daemon/gvfsbackendsftp.c:3168 ../daemon/gvfsbackendsftp.c:3210
-#: ../daemon/gvfsbackendsftp.c:3395 ../daemon/gvfsbackendsftp.c:3427
-#: ../daemon/gvfsbackendsftp.c:3482 ../daemon/gvfsbackendsftp.c:3539
-#: ../daemon/gvfsbackendsftp.c:3836 ../daemon/gvfsbackendsftp.c:3903
-#: ../daemon/gvfsbackendsftp.c:4038 ../daemon/gvfsbackendsftp.c:4098
-#: ../daemon/gvfsbackendsftp.c:4133 ../daemon/gvfsbackendsftp.c:4161
-#: ../daemon/gvfsbackendsftp.c:4269 ../daemon/gvfsbackendsftp.c:4323
-#: ../daemon/gvfsbackendsftp.c:4362 ../daemon/gvfsbackendsftp.c:4396
-#: ../daemon/gvfsbackendsftp.c:4430 ../daemon/gvfsbackendsftp.c:4445
-#: ../daemon/gvfsbackendsftp.c:4460 ../daemon/gvfsbackendsftp.c:4538
+#: ../daemon/gvfsbackendsftp.c:2009 ../daemon/gvfsbackendsftp.c:2398
+#: ../daemon/gvfsbackendsftp.c:2477 ../daemon/gvfsbackendsftp.c:2488
+#: ../daemon/gvfsbackendsftp.c:2544 ../daemon/gvfsbackendsftp.c:2630
+#: ../daemon/gvfsbackendsftp.c:2680 ../daemon/gvfsbackendsftp.c:2726
+#: ../daemon/gvfsbackendsftp.c:2801 ../daemon/gvfsbackendsftp.c:2908
+#: ../daemon/gvfsbackendsftp.c:3025 ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3178 ../daemon/gvfsbackendsftp.c:3190
+#: ../daemon/gvfsbackendsftp.c:3246 ../daemon/gvfsbackendsftp.c:3288
+#: ../daemon/gvfsbackendsftp.c:3473 ../daemon/gvfsbackendsftp.c:3505
+#: ../daemon/gvfsbackendsftp.c:3560 ../daemon/gvfsbackendsftp.c:3617
+#: ../daemon/gvfsbackendsftp.c:3914 ../daemon/gvfsbackendsftp.c:3981
+#: ../daemon/gvfsbackendsftp.c:4114 ../daemon/gvfsbackendsftp.c:4174
+#: ../daemon/gvfsbackendsftp.c:4209 ../daemon/gvfsbackendsftp.c:4237
+#: ../daemon/gvfsbackendsftp.c:4345 ../daemon/gvfsbackendsftp.c:4399
+#: ../daemon/gvfsbackendsftp.c:4438 ../daemon/gvfsbackendsftp.c:4472
+#: ../daemon/gvfsbackendsftp.c:4506 ../daemon/gvfsbackendsftp.c:4521
+#: ../daemon/gvfsbackendsftp.c:4536 ../daemon/gvfsbackendsftp.c:4614
 msgid "Invalid reply received"
 msgstr "Geçersiz cevap alındı"
 
-#: ../daemon/gvfsbackendsftp.c:2262
+#: ../daemon/gvfsbackendsftp.c:2257 ../daemon/gvfsbackendsmb.c:1440
+#: ../daemon/gvfsdaemonutils.c:211
+msgid " (invalid encoding)"
+msgstr ".(geçersiz kodlama)"
+
+#: ../daemon/gvfsbackendsftp.c:2342
 msgid "Failure"
 msgstr "Başarısız"
 
-#: ../daemon/gvfsbackendsftp.c:2370
+#: ../daemon/gvfsbackendsftp.c:2450
 #, c-format
 msgid "Invalid icon_id '%s' in OpenIconForRead"
 msgstr "OpenIconForRead içinde geçersiz icon_id '%s'"
 
-#: ../daemon/gvfsbackendsftp.c:2666
+#: ../daemon/gvfsbackendsftp.c:2746
 #, c-format
 msgid "Error creating backup file: %s"
 msgstr "Yedek dosya oluşturulurken hata: %s"
 
-#: ../daemon/gvfsbackendsftp.c:3272
+#: ../daemon/gvfsbackendsftp.c:3350
 msgid "Unable to create temporary file"
 msgstr "Geçici dosya oluşturulamadı"
 
-#: ../daemon/gvfsbackendsftp.c:4195 ../daemon/gvfsbackendsmb.c:1990
-msgid "Can't move directory over directory"
-msgstr "Dizin üstüne dizin taşınamıyor"
+#. translators: %s is a server name
+#: ../daemon/gvfsbackendsmbbrowse.c:375
+#, c-format
+msgid "Password required for %s"
+msgstr "%s için parola gerekli"
+
+#. translators: Name for the location that lists the smb shares
+#. availible on a server (%s is the name of the server)
+#: ../daemon/gvfsbackendsmbbrowse.c:902
+#, c-format
+msgid "Windows shares on %s"
+msgstr "%s üzerindeki Windows paylaşımları"
+
+#. translators: We tried to mount a windows (samba) share, but failed
+#: ../daemon/gvfsbackendsmbbrowse.c:1001
+msgid "Failed to retrieve share list from server"
+msgstr "Sunucudan paylaşım listesi alınırken başarısız olundu"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1157
+msgid "Not a regular file"
+msgstr "Düzenli bir dosya değil"
+
+#: ../daemon/gvfsbackendsmbbrowse.c:1489
+msgid "Windows Network Filesystem Service"
+msgstr "Windows Ağ Dosya Sistemi Servisi"
 
 #. translators: First %s is a share name, second is a server name
-#: ../daemon/gvfsbackendsmb.c:229
+#: ../daemon/gvfsbackendsmb.c:238
 #, c-format
 msgid "Password required for share %s on %s"
 msgstr "%2$s üzerinde %1$s paylaşımı için parola gerekli"
 
-#: ../daemon/gvfsbackendsmb.c:485 ../daemon/gvfsbackendsmb.c:531
+#: ../daemon/gvfsbackendsmb.c:494 ../daemon/gvfsbackendsmb.c:540
 #: ../daemon/gvfsdaemonutils.c:92
 #, c-format
 msgid "Internal Error (%s)"
 msgstr "Dahili Hata (%s)"
 
 #. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmb.c:611
+#: ../daemon/gvfsbackendsmb.c:624
 msgid "Failed to mount Windows share"
 msgstr "Windows paylaşımı bağlama başarısız oldu"
 
-#: ../daemon/gvfsbackendsmb.c:772 ../daemon/gvfsbackendsmb.c:1268
+#: ../daemon/gvfsbackendsmb.c:788 ../daemon/gvfsbackendsmb.c:1284
 msgid "Unsupported seek type"
 msgstr "Atlama türü desteklenmiyor"
 
-#: ../daemon/gvfsbackendsmb.c:1360
+#: ../daemon/gvfsbackendsmb.c:1376
 #, c-format
 msgid "Backup file creation failed: %s"
 msgstr "Yedek dosyası oluşturma başarısız: %s"
 
-#: ../daemon/gvfsbackendsmb.c:1892
-#, c-format
-msgid "Error deleting file: %s"
-msgstr "Dosya silinirken hata: %s"
+#: ../daemon/gvfsbackendsmb.c:1734
+#| msgid "Invalid attribute type %s\n"
+msgid "Invalid attribute type (uint64 expected)"
+msgstr "Geçersiz öznitelik türü (uint64 bekleniyor)"
+
+#: ../daemon/gvfsbackendsmb.c:1922
+#| msgid "Target file already exists"
+msgid "Can't rename file, filename already exists"
+msgstr "Dosya yeniden adlandırılamıyor, dosya adı zaten mevcut"
 
-#: ../daemon/gvfsbackendsmb.c:1966
+#: ../daemon/gvfsbackendsmb.c:2047
 #, c-format
 msgid "Error moving file: %s"
 msgstr "Dosya taşınırken hata: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2038
+#: ../daemon/gvfsbackendsmb.c:2119
 #, c-format
 msgid "Error removing target file: %s"
 msgstr "Hedef dosya silinirken hata: %s"
 
-#: ../daemon/gvfsbackendsmb.c:2062
+#: ../daemon/gvfsbackendsmb.c:2143
 msgid "Can't recursively move directory"
 msgstr "Dizin iç içe taşınamıyor"
 
-#: ../daemon/gvfsbackendsmb.c:2128
+#: ../daemon/gvfsbackendsmb.c:2187
 msgid "Windows Shares Filesystem Service"
 msgstr "Windows Paylaşımlar Dosya Sistemi Servisi"
 
-#. translators: %s is a server name
-#: ../daemon/gvfsbackendsmbbrowse.c:365
-#, c-format
-msgid "Password required for %s"
-msgstr "%s için parola gerekli"
-
-#. translators: Name for the location that lists the smb shares
-#. availible on a server (%s is the name of the server)
-#: ../daemon/gvfsbackendsmbbrowse.c:893
-#, c-format
-msgid "Windows shares on %s"
-msgstr "%s üzerindeki Windows paylaşımları"
-
-#. translators: We tried to mount a windows (samba) share, but failed
-#: ../daemon/gvfsbackendsmbbrowse.c:992
-msgid "Failed to retrieve share list from server"
-msgstr "Sunucudan paylaşım listesi alınırken başarısız olundu"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1080 ../daemon/gvfsbackendsmbbrowse.c:1126
-msgid "The file is not a mountable"
-msgstr "Dosya bağlanılabilir değil"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1148
-msgid "Not a regular file"
-msgstr "Düzenli bir dosya değil"
-
-#: ../daemon/gvfsbackendsmbbrowse.c:1503
-msgid "Windows Network Filesystem Service"
-msgstr "Windows Ağ Dosya Sistemi Servisi"
-
 #: ../daemon/gvfsbackendtrash.c:370 ../daemon/gvfsbackendtrash.c:426
 msgid "The trash folder may not be deleted"
 msgstr "Çöp klasörü silinmemeli"
@@ -1188,25 +1656,26 @@ msgstr "Çöp içerisindeki öğeler değiştirilmemeli"
 msgid "Trash"
 msgstr "Çöp"
 
-#: ../daemon/gvfsdaemon.c:1056
+#: ../daemon/gvfsdaemon.c:1057
 msgid "Invalid backend type"
 msgstr "Geçersiz arkayüz türü"
 
 #: ../daemon/gvfsdaemonutils.c:104
 #, c-format
-msgid "Error sending fd: %s"
-msgstr "fd gönderilirken hata: %s"
+#| msgid "Error sending fd: %s"
+msgid "Error sending file descriptor: %s"
+msgstr "Dosya tanımlayıcısı gönderilirken hata: %s"
 
-#: ../daemon/gvfsftpconnection.c:175
+#: ../daemon/gvfsftpconnection.c:180
 msgid "Unexpected end of stream"
 msgstr "Beklenilmeyen akış sonu"
 
-#: ../daemon/gvfsftpconnection.c:191 ../daemon/gvfsftpconnection.c:204
-#: ../daemon/gvfsftptask.c:403 ../daemon/gvfsftptask.c:831
+#: ../daemon/gvfsftpconnection.c:196 ../daemon/gvfsftpconnection.c:209
+#: ../daemon/gvfsftptask.c:411 ../daemon/gvfsftptask.c:839
 msgid "Invalid reply"
 msgstr "Geçersiz cevap"
 
-#: ../daemon/gvfsftpconnection.c:380
+#: ../daemon/gvfsftpconnection.c:392
 msgid ""
 "Failed to create active FTP connection. Maybe your router does not support "
 "this?"
@@ -1214,7 +1683,7 @@ msgstr ""
 "Etkin FTP bağlantısı oluşturulamıyor. Belki router'ınız bunu "
 "desteklemiyordur?"
 
-#: ../daemon/gvfsftpconnection.c:387
+#: ../daemon/gvfsftpconnection.c:399
 msgid "Failed to create active FTP connection."
 msgstr "Etkin FTP bağlantısı oluşturulamadı."
 
@@ -1222,48 +1691,48 @@ msgstr "Etkin FTP bağlantısı oluşturulamadı."
 msgid "Filename contains invalid characters."
 msgstr "Dosya adı geçersiz karakterler içeriyor."
 
-#: ../daemon/gvfsftptask.c:252
+#: ../daemon/gvfsftptask.c:261
 msgid "The FTP server is busy. Try again later"
 msgstr "FTP sunucusu meşgul. Daha sonra tekrar deneyin"
 
-#: ../daemon/gvfsftptask.c:347
+#: ../daemon/gvfsftptask.c:355
 msgid "Accounts are unsupported"
 msgstr "Hesaplar desteklenmiyor"
 
-#: ../daemon/gvfsftptask.c:351
+#: ../daemon/gvfsftptask.c:359
 msgid "Host closed connection"
 msgstr "Makine bağlantıyı kapattı"
 
-#: ../daemon/gvfsftptask.c:355
+#: ../daemon/gvfsftptask.c:363
 msgid "Cannot open data connection. Maybe your firewall prevents this?"
 msgstr ""
 "Veri bağlantısı açılamıyor. Güvenlik duvarınız bunu engelliyor olabilir mi?"
 
-#: ../daemon/gvfsftptask.c:359
+#: ../daemon/gvfsftptask.c:367
 msgid "Data connection closed"
 msgstr "Veri bağlantısı kapatıldı"
 
-#: ../daemon/gvfsftptask.c:366 ../daemon/gvfsftptask.c:370
+#: ../daemon/gvfsftptask.c:374 ../daemon/gvfsftptask.c:378
 msgid "Operation failed"
 msgstr "İşlem başarısız oldu"
 
-#: ../daemon/gvfsftptask.c:375
+#: ../daemon/gvfsftptask.c:383
 msgid "No space left on server"
 msgstr "Sunucuda yer kalmadı"
 
-#: ../daemon/gvfsftptask.c:387
+#: ../daemon/gvfsftptask.c:395
 msgid "Unsupported network protocol"
 msgstr "Desteklenmeyen ağ protokolü"
 
-#: ../daemon/gvfsftptask.c:395
+#: ../daemon/gvfsftptask.c:403
 msgid "Page type unknown"
 msgstr "Sayfa türü bilinmiyor"
 
-#: ../daemon/gvfsftptask.c:399
+#: ../daemon/gvfsftptask.c:407
 msgid "Invalid filename"
 msgstr "Geçersiz dosya adı"
 
-#: ../daemon/gvfsjobmakesymlink.c:126
+#: ../daemon/gvfsjobmakesymlink.c:127
 msgid "Symlinks not supported by backend"
 msgstr "Arkayüz tarafından sembolik bağlar desteklenmiyor"
 
@@ -1271,6 +1740,10 @@ msgstr "Arkayüz tarafından sembolik bağlar desteklenmiyor"
 msgid "Invalid dbus message"
 msgstr "Geçersiz dbus mesajı"
 
+#: ../daemon/gvfsjobunmount.c:156
+msgid "Filesystem is busy"
+msgstr "Dosya sistemi meşgul"
+
 #: ../daemon/main.c:45 ../metadata/meta-daemon.c:694
 msgid "Replace old daemon."
 msgstr "Eski servisin yerine kondu."
@@ -1279,54 +1752,56 @@ msgstr "Eski servisin yerine kondu."
 msgid "Don't start fuse."
 msgstr "fuse'ü başlatma."
 
-#: ../daemon/main.c:58
+#: ../daemon/main.c:60
 msgid "GVFS Daemon"
 msgstr "GVFS Servisi"
 
-#: ../daemon/main.c:61
+#: ../daemon/main.c:63
 msgid "Main daemon for GVFS"
 msgstr "GVFS için ana servis"
 
 #. Translators: the first %s is the application name,
 #. the second %s is the error message
-#: ../daemon/main.c:76 ../metadata/meta-daemon.c:718
+#: ../daemon/main.c:78 ../metadata/meta-daemon.c:718
 #, c-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: ../daemon/main.c:78 ../metadata/meta-daemon.c:720
+#: ../daemon/main.c:80 ../metadata/meta-daemon.c:720
 #: ../programs/gvfs-cat.c:163 ../programs/gvfs-cat.c:176
-#: ../programs/gvfs-copy.c:110 ../programs/gvfs-info.c:371
-#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mkdir.c:59
-#: ../programs/gvfs-move.c:98 ../programs/gvfs-open.c:140
-#: ../programs/gvfs-open.c:153 ../programs/gvfs-save.c:165
-#: ../programs/gvfs-set-attribute.c:128 ../programs/gvfs-tree.c:251
+#: ../programs/gvfs-copy.c:123 ../programs/gvfs-info.c:371
+#: ../programs/gvfs-ls.c:392 ../programs/gvfs-mime.c:87
+#: ../programs/gvfs-mime.c:98 ../programs/gvfs-mime.c:106
+#: ../programs/gvfs-mkdir.c:60 ../programs/gvfs-move.c:111
+#: ../programs/gvfs-open.c:141 ../programs/gvfs-open.c:154
+#: ../programs/gvfs-save.c:165 ../programs/gvfs-set-attribute.c:128
+#: ../programs/gvfs-tree.c:251
 #, c-format
 msgid "Try \"%s --help\" for more information."
 msgstr "Daha fazla bilgi için \"%s --help\" deneyin."
 
-#: ../daemon/mount.c:456
+#: ../daemon/mount.c:458
 msgid "Invalid arguments from spawned child"
 msgstr "Yeniden başlatılan alt süreçler için geçersiz parametreler"
 
-#: ../daemon/mount.c:767
+#: ../daemon/mount.c:779
 #, c-format
 msgid "Automount failed: %s"
 msgstr "Kendiliğinden bağlama başarısız oldu: %s"
 
-#: ../daemon/mount.c:812 ../daemon/mount.c:886
+#: ../daemon/mount.c:825 ../daemon/mount.c:903
 msgid "The specified location is not mounted"
 msgstr "Belirtilen konum bağlanmamış"
 
-#: ../daemon/mount.c:817
+#: ../daemon/mount.c:830
 msgid "The specified location is not supported"
 msgstr "Belirtilen konum desteklenmiyor"
 
-#: ../daemon/mount.c:1023
+#: ../daemon/mount.c:1045
 msgid "Location is already mounted"
 msgstr "Konum zaten bağlanmış"
 
-#: ../daemon/mount.c:1031
+#: ../daemon/mount.c:1053
 msgid "Location is not mountable"
 msgstr "Konum bağlanılabilir değil"
 
@@ -1365,26 +1840,27 @@ msgstr "GVFS için metadata servisi"
 msgid "GVfs GDU Volume Monitor"
 msgstr "GVfs GDU Birim İzleyici"
 
-#: ../monitor/gdu/ggdudrive.c:165 ../monitor/hal/ghaldrive.c:179
+#: ../monitor/gdu/ggdudrive.c:168 ../monitor/hal/ghaldrive.c:179
 msgid "Floppy Drive"
 msgstr "Disket Sürücü"
 
-#: ../monitor/gdu/ggdudrive.c:257
+#: ../monitor/gdu/ggdudrive.c:258
 #, c-format
 msgid "Unnamed Drive (%s)"
 msgstr "İsimsiz Sürücü (%s)"
 
-#: ../monitor/gdu/ggdudrive.c:259
+#: ../monitor/gdu/ggdudrive.c:260
 msgid "Unnamed Drive"
 msgstr "İsimsiz Sürücü"
 
-#: ../monitor/gdu/ggdudrive.c:559 ../monitor/hal/ghaldrive.c:662
+#: ../monitor/gdu/ggdudrive.c:561
 #, c-format
-msgid "Failed to eject media; one or more volumes on the media are busy."
+#| 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 ""
-"Ortamı çıkartma başarısız; ortam üzerinde bir ya da daha fazla sistem meşgul."
+"Ortamı çıkartma başarısız; ortam üzerindeki bir ya da daha fazla birim meşgul."
 
-#: ../monitor/gdu/ggdudrive.c:1003
+#: ../monitor/gdu/ggdudrive.c:1017
 msgid ""
 "Start drive in degraded mode?\n"
 "Starting a drive in degraded mode means that the drive is no longer tolerant "
@@ -1395,28 +1871,28 @@ msgstr ""
 "olmayacağı anlamına gelir. Bir bileşen başarısız olursa sürücüdeki veriler "
 "geri kurtarılamayacak şekilde kaybolabilir."
 
-#: ../monitor/gdu/ggdudrive.c:1009
+#: ../monitor/gdu/ggdudrive.c:1023
 msgid "Start Anyway"
 msgstr "Gene de Başlat"
 
-#: ../monitor/gdu/ggdumount.c:817
+#: ../monitor/gdu/ggdumount.c:860
 msgid "One or more programs are preventing the unmount operation."
 msgstr "Bir veya daha fazla program unmount işlemini engellemektedir."
 
-#: ../monitor/gdu/ggdumount.c:945
+#: ../monitor/gdu/ggdumount.c:988
 msgid "Cannot get LUKS cleartext slave"
 msgstr "LUKS düz yazı kölesi alınamıyor"
 
-#: ../monitor/gdu/ggdumount.c:967
+#: ../monitor/gdu/ggdumount.c:1010
 #, c-format
 msgid "Cannot get LUKS cleartext slave from path `%s'"
 msgstr "Yolundan `%s 'LUKS düz yazı kölesi alınamıyor"
 
-#: ../monitor/gdu/ggduvolume.c:308
+#: ../monitor/gdu/ggduvolume.c:337
 msgid "Floppy Disk"
 msgstr "Disket Sürücü"
 
-#: ../monitor/gdu/ggduvolume.c:1022
+#: ../monitor/gdu/ggduvolume.c:1097
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1425,7 +1901,7 @@ msgstr ""
 "Birimin kilidini kaldırmak için bir parola girin\n"
 "Aygıt \"%s\" bölümleme \"%d\" üzerinde şifrelenmiş veriler içeriyor."
 
-#: ../monitor/gdu/ggduvolume.c:1029
+#: ../monitor/gdu/ggduvolume.c:1104
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1434,7 +1910,7 @@ msgstr ""
 "Birimin kilidini kaldırmak için bir parola girin\n"
 "Aygıt \"%s\" şifrelenmiş veriler içeriyor."
 
-#: ../monitor/gdu/ggduvolume.c:1036
+#: ../monitor/gdu/ggduvolume.c:1111
 #, c-format
 msgid ""
 "Enter a password to unlock the volume\n"
@@ -1719,6 +2195,12 @@ msgstr "Thumb Sürücü"
 msgid "Mass Storage Drive"
 msgstr "Depolama Aygıtı Sürücü"
 
+#: ../monitor/hal/ghaldrive.c:662
+#, c-format
+msgid "Failed to eject media; one or more volumes on the media are busy."
+msgstr ""
+"Ortamı çıkartma başarısız; ortam üzerinde bir ya da daha fazla sistem meşgul."
+
 #: ../monitor/hal/ghalmount.c:159 ../monitor/hal/ghalvolume.c:163
 #, c-format
 msgid "%.1f kB"
@@ -1739,11 +2221,11 @@ msgid "Mixed Audio/Data Disc"
 msgstr "Karışık Ses/Veri Diski"
 
 #. Translators: %s is the size of the mount (e.g. 512 MB)
-#. Translators: %s is the size of the volume (e.g. 512 MB)
-#: ../monitor/hal/ghalmount.c:336 ../monitor/hal/ghalvolume.c:255
+#: ../monitor/hal/ghalmount.c:336
 #, c-format
-msgid "%s Media"
-msgstr "%s Ortam"
+#| msgid "%s Media"
+msgid "%s Medium"
+msgstr "%s'lık Ortam"
 
 #. Translators: %s is the size of the volume (e.g. 512 MB)
 #: ../monitor/hal/ghalvolume.c:232
@@ -1751,6 +2233,12 @@ msgstr "%s Ortam"
 msgid "%s Encrypted Data"
 msgstr "%s Şifreli Veri"
 
+#. Translators: %s is the size of the volume (e.g. 512 MB)
+#: ../monitor/hal/ghalvolume.c:255
+#, c-format
+msgid "%s Media"
+msgstr "%s Ortam"
+
 #: ../programs/gvfs-cat.c:37
 msgid "locations"
 msgstr "konum"
@@ -1809,18 +2297,19 @@ msgstr ""
 "Not: eğer biçimleme seçenekleri -n, -T ya da diğerlerine ihtiyaç "
 "duyuyorsanız sadece cat'e borulayın."
 
-#: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:108
+#: ../programs/gvfs-cat.c:161 ../programs/gvfs-copy.c:121
 #: ../programs/gvfs-info.c:369 ../programs/gvfs-ls.c:390
-#: ../programs/gvfs-mkdir.c:57 ../programs/gvfs-move.c:96
-#: ../programs/gvfs-open.c:138 ../programs/gvfs-save.c:163
-#: ../programs/gvfs-set-attribute.c:126 ../programs/gvfs-tree.c:249
+#: ../programs/gvfs-mime.c:84 ../programs/gvfs-mkdir.c:58
+#: ../programs/gvfs-move.c:109 ../programs/gvfs-open.c:139
+#: ../programs/gvfs-save.c:163 ../programs/gvfs-set-attribute.c:126
+#: ../programs/gvfs-tree.c:249
 #, c-format
 msgid "Error parsing commandline options: %s\n"
 msgstr "Komut satırı seçenekleri ayrıştırırken hata : %s\n"
 
 #. Translators: the %s is the program name. This error message
 #. means the user is calling gvfs-cat without any argument.
-#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:151
+#: ../programs/gvfs-cat.c:174 ../programs/gvfs-open.c:152
 #, c-format
 msgid "%s: missing locations"
 msgstr "%s: eksik konumlar"
@@ -1854,32 +2343,29 @@ msgstr "asla sembolik bağları takip etme"
 msgid "progress"
 msgstr "ilerleme"
 
-#: ../programs/gvfs-copy.c:101 ../programs/gvfs-move.c:89
-#: ../programs/gvfs-save.c:156
-msgid "- output files at <location>"
-msgstr "- <location>'daki çıktı dosyaları"
+#: ../programs/gvfs-copy.c:115
+msgid "SOURCE... DEST - copy file(s) from SOURCE to DEST"
+msgstr "SOURCE... DEST - SOURCE'taki dosya(lar)ı DEST'e kopyala"
 
-#: ../programs/gvfs-copy.c:119 ../programs/gvfs-move.c:107
-#, c-format
+#: ../programs/gvfs-copy.c:132 ../programs/gvfs-move.c:120
 msgid "Missing operand\n"
 msgstr "Eksik işlenen\n"
 
-#: ../programs/gvfs-copy.c:127 ../programs/gvfs-move.c:115
-#, c-format
+#: ../programs/gvfs-copy.c:140 ../programs/gvfs-move.c:128
 msgid "Too many arguments\n"
 msgstr "Çok fazla argüman\n"
 
-#: ../programs/gvfs-copy.c:136 ../programs/gvfs-move.c:124
+#: ../programs/gvfs-copy.c:149 ../programs/gvfs-move.c:137
 #, c-format
 msgid "Target %s is not a directory\n"
 msgstr "Hedef %s bir dizin değil\n"
 
-#: ../programs/gvfs-copy.c:177
+#: ../programs/gvfs-copy.c:193
 #, c-format
 msgid "overwrite %s?"
 msgstr "%s üzerine yazılsın mı?"
 
-#: ../programs/gvfs-copy.c:191
+#: ../programs/gvfs-copy.c:207
 #, c-format
 msgid "Error copying file %s: %s\n"
 msgstr "Dosya %s kopyalanırken hata: %s\n"
@@ -2008,7 +2494,7 @@ msgid "Show completions"
 msgstr "Tamamlamaları göster"
 
 #: ../programs/gvfs-ls.c:164 ../programs/gvfs-ls.c:171
-#: ../programs/gvfs-rename.c:68
+#: ../programs/gvfs-rename.c:69
 #, c-format
 msgid "Error: %s\n"
 msgstr "Hata: %s\n"
@@ -2017,19 +2503,77 @@ msgstr "Hata: %s\n"
 msgid "- list files at <location>"
 msgstr "- <location> daki dosyaları listele"
 
+#: ../programs/gvfs-mime.c:36
+msgid "Query handler for mime-type"
+msgstr "Mime türünün işleyicisini sorgula"
+
+#: ../programs/gvfs-mime.c:37
+msgid "Set handler for mime-type"
+msgstr "Mime türünün işleyicisini ayarla"
+
+#: ../programs/gvfs-mime.c:76
+msgid "- get/set handler for <mimetype>"
+msgstr "- <mime-türü> işleyicisini al/ayarla"
+
+#: ../programs/gvfs-mime.c:85
+msgid "Specify one of --query and --set"
+msgstr "--query ya da --set olarak belirtin"
+
+#: ../programs/gvfs-mime.c:97
+#, c-format
+msgid "Must specify a single mime-type.\n"
+msgstr "Tek bir mime türü belirtilmelidir.\n"
+
+#: ../programs/gvfs-mime.c:105
+#, c-format
+msgid "Must specify the mime-type followed by the default handler.\n"
+msgstr ""
+"Mime türü, sonrasında öntanımlı işleyici gelecek şekilde belirtilmelidir.\n"
+
+#: ../programs/gvfs-mime.c:121
+#, c-format
+msgid "No default applications for '%s'\n"
+msgstr "'%s' için öntanımlı uygulama yok\n"
+
+#: ../programs/gvfs-mime.c:127
+#, c-format
+msgid "Default application for '%s': %s\n"
+msgstr "'%s' için öntanımlı uygulama: %s\n"
+
+#: ../programs/gvfs-mime.c:132
+#, c-format
+msgid "Registered applications:\n"
+msgstr "Kayıtlı uygulamalar:\n"
+
+#: ../programs/gvfs-mime.c:152
+#, c-format
+msgid "Failed to load info for handler '%s'\n"
+msgstr "'%s' işleyicisi bilgilerinin yüklenmesi başarısız oldu\n"
+
+#: ../programs/gvfs-mime.c:158
+#, c-format
+msgid "Failed to set '%s' as the default handler for '%s': %s\n"
+msgstr ""
+"'%s'in, '%s' için öntanımlı işleyici olarak ayarlanması başarısız oldu: %s\n"
+
 #: ../programs/gvfs-mkdir.c:33
 msgid "create parent directories"
 msgstr "üst dizinleri oluştur"
 
-#: ../programs/gvfs-mkdir.c:50 ../programs/gvfs-rm.c:52
-msgid "- delete files"
-msgstr "- dosyaları sil"
+#: ../programs/gvfs-mkdir.c:51
+#| msgid "create parent directories"
+msgid "- create directories"
+msgstr "- dizinleri oluştur"
 
-#: ../programs/gvfs-mkdir.c:78 ../programs/gvfs-mkdir.c:86
+#: ../programs/gvfs-mkdir.c:79 ../programs/gvfs-mkdir.c:88
 #, c-format
 msgid "Error creating directory: %s\n"
 msgstr "Dizin oluşturuken hata: %s\n"
 
+#: ../programs/gvfs-monitor-dir.c:38 ../programs/gvfs-monitor-file.c:38
+msgid "Don't send single MOVED events."
+msgstr "Tekli MOVED olaylarını gönderme."
+
 #: ../programs/gvfs-mount.c:54
 msgid "Mount as mountable"
 msgstr "Bağlanılabilir olarak bağla"
@@ -2046,53 +2590,58 @@ msgstr "Bağı kes"
 msgid "Unmount all mounts with the given scheme"
 msgstr "Tüm bağların verilen şema ile bağını kes"
 
-#: ../programs/gvfs-mount.c:58
+#. Translator: List here is a verb as in 'List all mounts'
+#: ../programs/gvfs-mount.c:59
 msgid "List"
 msgstr "Liste"
 
-#: ../programs/gvfs-mount.c:59
+#: ../programs/gvfs-mount.c:60
 msgid "Show extra information for List and Monitor"
 msgstr "Liste ve Monitor için ek bilgiler göster"
 
-#: ../programs/gvfs-mount.c:60
+#: ../programs/gvfs-mount.c:61
 msgid "Monitor events"
 msgstr "Monitör olayları"
 
-#: ../programs/gvfs-mount.c:163 ../programs/gvfs-mount.c:184
+#: ../programs/gvfs-mount.c:164 ../programs/gvfs-mount.c:185
 #, c-format
 msgid "Error mounting location: %s\n"
 msgstr "Konum bağlanırken hata: %s\n"
 
-#: ../programs/gvfs-mount.c:241
+#: ../programs/gvfs-mount.c:242
 #, c-format
 msgid "Error unmounting mount: %s\n"
 msgstr "Bağın bağı kaldırılırken hata: %s\n"
 
-#: ../programs/gvfs-mount.c:262
+#: ../programs/gvfs-mount.c:263
 #, c-format
 msgid "Error finding enclosing mount: %s\n"
 msgstr "Kapsanan bağ bulunurken hata: %s\n"
 
-#: ../programs/gvfs-mount.c:673
+#: ../programs/gvfs-mount.c:696
 #, c-format
 msgid "Error mounting %s: %s\n"
 msgstr "%s bağlanırken hata: %s\n"
 
-#: ../programs/gvfs-mount.c:687
+#: ../programs/gvfs-mount.c:710
 #, c-format
 msgid "Mounted %s at %s\n"
 msgstr "%s bağlandı konumu %s\n"
 
-#: ../programs/gvfs-mount.c:738
+#: ../programs/gvfs-mount.c:761
 #, c-format
 msgid "No volume for device file %s\n"
 msgstr "Aygıt dosyası %s için birim yok\n"
 
-#: ../programs/gvfs-mount.c:931
+#: ../programs/gvfs-mount.c:952
 msgid "- mount <location>"
 msgstr "- <location>u bağla"
 
-#: ../programs/gvfs-move.c:173
+#: ../programs/gvfs-move.c:103
+msgid "SOURCE... DEST - move file(s) from SOURCE to DEST"
+msgstr "SOURCE... DEST - SOURCE'taki dosya(lar)ı DEST'e taşı"
+
+#: ../programs/gvfs-move.c:189
 #, c-format
 msgid "Error moving file %s: %s\n"
 msgstr "Dosya %s taşınırken hata: %s\n"
@@ -2115,24 +2664,24 @@ msgstr "%s: %s: konum açılırken hata: %s\n"
 msgid "%s: %s: error launching application: %s\n"
 msgstr "%s: %s: uygulama başlatılırken hata: %s\n"
 
-#: ../programs/gvfs-open.c:122
+#: ../programs/gvfs-open.c:123
 msgid "FILES... - open FILES with registered application."
 msgstr "DOSYALAR... - kayıtlı uygulamayla DOSYALAR açılır."
 
 #. Translators: this message will appear after the usage string
 #. and before the list of options.
-#: ../programs/gvfs-open.c:126
+#: ../programs/gvfs-open.c:127
 msgid ""
 "Opens the file(s) with the default application registered to handle the type "
 "of the file."
 msgstr ""
 "Dosya türünü işlemek için kayıtlı öntanımlı uygulama ile dosya(lar) açılır."
 
-#: ../programs/gvfs-rename.c:49
+#: ../programs/gvfs-rename.c:50
 msgid "- rename file"
 msgstr "- dosyayı yeniden adlandır"
 
-#: ../programs/gvfs-rename.c:74
+#: ../programs/gvfs-rename.c:76
 #, c-format
 msgid "Rename successful. New uri: %s\n"
 msgstr "Başarılı olarak yeniden adlandırıldı. Yeni uri: %s \n"
@@ -2141,6 +2690,10 @@ msgstr "Başarılı olarak yeniden adlandırıldı. Yeni uri: %s \n"
 msgid "ignore nonexistent files, never prompt"
 msgstr "var olmayan dosyaları görmezden gel, asla sorma"
 
+#: ../programs/gvfs-rm.c:53
+msgid "- delete files"
+msgstr "- dosyaları sil"
+
 #: ../programs/gvfs-save.c:43
 msgid "Create backup"
 msgstr "Yedeği oluştur"
@@ -2184,13 +2737,20 @@ msgstr "Kapatma hatası: %s\n"
 msgid "Etag not available\n"
 msgstr "Etag mevcut değil\n"
 
+#: ../programs/gvfs-save.c:156
+msgid "DEST - read from standard input and save to DEST"
+msgstr "DEST - standart girişten oku ve DEST'e kaydet"
+
 #: ../programs/gvfs-set-attribute.c:36
+#| msgid ""
+#| "attribute type [string, bytestring, boolean, uint32, int32, uint64, "
+#| "int64, stringv]"
 msgid ""
 "attribute type [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv]"
+"stringv, unset]"
 msgstr ""
 "öznitelik türü [string, bytestring, boolean, uint32, int32, uint64, int64, "
-"stringv]"
+"stringv, unset]"
 
 #: ../programs/gvfs-set-attribute.c:119
 msgid " <location> <attribute> <values> - set attribute"
@@ -2206,29 +2766,75 @@ msgstr "Konum belirtilmemiş\n"
 msgid "Attribute not specified\n"
 msgstr "Öznitelik belirtilmemiş\n"
 
-#: ../programs/gvfs-set-attribute.c:189
+#: ../programs/gvfs-set-attribute.c:154
+#, c-format
+#| msgid "Attribute not specified\n"
+msgid "Value not specified\n"
+msgstr "Değer belirtilmemiş\n"
+
+#: ../programs/gvfs-set-attribute.c:194
 #, c-format
 msgid "Invalid attribute type %s\n"
 msgstr "Geçersiz öznitelik türü %s\n"
 
-#: ../programs/gvfs-set-attribute.c:199
+#: ../programs/gvfs-set-attribute.c:204
 #, c-format
 msgid "Error setting attribute: %s\n"
 msgstr "Öznitelik atanırken hata: %s\n"
 
-#: ../programs/gvfs-trash.c:51
+#: ../programs/gvfs-trash.c:52
 msgid "- move files to trash"
 msgstr "- dosyaları çöpe taşı"
 
-#: ../programs/gvfs-trash.c:67
+#: ../programs/gvfs-trash.c:69
 #, c-format
 msgid "Error trashing file: %s\n"
 msgstr "Dosya çöpe atılırken hata: %s\n"
 
 #: ../programs/gvfs-tree.c:37
-msgid "Follow symlinks, mounts and shortcuts like dirs"
-msgstr "Sembolik bağları, bağlamaları ve kısayol gibi dizinleri izle"
+#| msgid "Follow symlinks, mounts and shortcuts like dirs"
+msgid "Follow symbolic links, mounts and shortcuts like directories"
+msgstr "Sembolik bağları, bağlamaları ve kısayolları dizin gibi izle"
 
 #: ../programs/gvfs-tree.c:242
 msgid "- list contents of directories in a tree-like format"
 msgstr "- ağaç benzeri biçimde dizinlerin içeriklerini listele"
+
+#~ msgid "Invalid return value from get_info"
+#~ msgstr "get_info geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from query_info"
+#~ msgstr "query_info geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from call"
+#~ msgstr "call geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from get_filesystem_info"
+#~ msgstr "get_filesystem_info geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from query_filesystem_info"
+#~ msgstr "query_filesystem_info geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from monitor_dir"
+#~ msgstr "monitor_dir geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from monitor_file"
+#~ msgstr "monitor_file geçersiz bir değer döndürdü"
+
+#~ msgid "Invalid return value from open_icon_for_read"
+#~ msgstr "open_icon_for_read geçersiz değer döndü"
+
+#~ msgid "ftp on %s"
+#~ msgstr "%s üzerinde ftp"
+
+#~ msgid "Error renaming dir"
+#~ msgstr "Dizin tekrar adlandırılırken hata"
+
+#~ msgid "Enter password"
+#~ msgstr "Parolayı girin"
+
+#~ msgid "sftp on %s"
+#~ msgstr "%s üzerinde sftp"
+
+#~ msgid "- output files at <location>"
+#~ msgstr "- <location>'daki çıktı dosyaları"
diff --git a/programs/gvfs-mime.c b/programs/gvfs-mime.c
index 3ef923f2..0930d615 100644
--- a/programs/gvfs-mime.c
+++ b/programs/gvfs-mime.c
@@ -130,6 +130,21 @@ main (int argc, char *argv[])
           list = g_app_info_get_all_for_type (mimetype);
           if (list != NULL)
             g_print (_("Registered applications:\n"));
+	  else
+	    g_print (_("No registered applications\n"));
+          for (l = list; l != NULL; l = l->next)
+	    {
+	      info = l->data;
+	      g_print ("\t%s\n", g_app_info_get_id (info));
+	      g_object_unref (info);
+	    }
+	  g_list_free (list);
+
+	  list = g_app_info_get_recommended_for_type (mimetype);
+	  if (list != NULL)
+            g_print (_("Recommended applications:\n"));
+	  else
+	    g_print (_("No recommended applications\n"));
           for (l = list; l != NULL; l = l->next)
 	    {
 	      info = l->data;