Hello community,
here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2016-02-25 21:53:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gvfs (Old)
and /work/SRC/openSUSE:Factory/.gvfs.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs"
Changes:
--------
--- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2015-11-12 19:38:44.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2016-02-25 21:53:55.000000000 +0100
@@ -1,0 +2,12 @@
+Thu Feb 18 13:22:35 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 1.26.3:
+ + udisks2: Avoid crashes during unmount.
+ + ftp: Fix cache invalidation after writing.
+ + network: Fix crashes when mount failed.
+ + metadata: Avoid endless recursion when copying meta files.
+ + udisks2: Do not show notification if unmount failed.
+ + Several smaller bugfixes.
+ + Updated translations.
+
+-------------------------------------------------------------------
Old:
----
gvfs-1.26.2.tar.xz
New:
----
gvfs-1.26.3.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gvfs.spec ++++++
--- /var/tmp/diff_new_pack.CST11Z/_old 2016-02-25 21:53:56.000000000 +0100
+++ /var/tmp/diff_new_pack.CST11Z/_new 2016-02-25 21:53:56.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package gvfs
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -20,7 +20,7 @@
%define with_cdda 1
Name: gvfs
-Version: 1.26.2
+Version: 1.26.3
Release: 0
Summary: VFS functionality for GLib
License: LGPL-2.0+
++++++ gvfs-1.26.2.tar.xz -> gvfs-1.26.3.tar.xz ++++++
++++ 3213 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/ChangeLog new/gvfs-1.26.3/ChangeLog
--- old/gvfs-1.26.2/ChangeLog 2015-11-09 13:35:23.000000000 +0100
+++ new/gvfs-1.26.3/ChangeLog 2016-02-18 14:06:10.000000000 +0100
@@ -1,6 +1,148 @@
+commit 1d5bc3bb7a66e385876888d463002d1c9397642c
+Author: Ondrej Holy
+Date: 2016-02-18
+
+ Update NEWS for 1.26.3 release
+
+M NEWS
+
+commit 12f104b037312be771983ad7eb67f34e841a0bdd
+Author: Ondrej Holy
+Date: 2016-02-06
+
+ udisks2: Avoid crashes during unmount
+
+ Commit c014b64 was pushed to prevent race between unmount reply and
+ retry timer. Result of mount operation reply should be stored if
+ unmount operation is in progress, however it isn't, because the
+ conditional statement is always true. Fix the condition accordingly.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=678555
+
+M monitor/udisks2/gvfsudisks2mount.c
+
+commit ea78c2bf2fdd357d69c50a66eb664cde76beb1b6
+Author: Ondrej Holy
+Date: 2016-01-05
+
+ ftp: Invalidate dir cache on write close
+
+ Wrong file size is cached if query_info is executed during write
+ operation, because dir cache is invalidated on open_for_write. Wrong
+ file size might cause that e.g. POSIX editors fails to read file
+ content over fuse daemon. Invalidate the cache also on close_write
+ to fix this issue.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=760159
+
+M daemon/gvfsbackendftp.c
+
+commit 428adf56bbca298c0a92091de6dc10369d020a83
+Author: Ondrej Holy
+Date: 2016-01-27
+
+ network: Fix crashes when mount failed
+
+ Mount operation might fail if you run multiple mount operations
+ concurrently.
+ Backend memory is released consequently. Unfortunatelly some idle
+ sources
+ and signal handlers are not removed, which might cause segmentation
+ faults.
+ This patch fixes this and also some other memory leaks.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=712235
+
+M daemon/gvfsbackendnetwork.c
+
+commit b7a511b4c80ccf996985a8c009ecc07b7fa97f03
+Author: Wolfgang Stöggl
+Date: 2016-01-21
+
+ Updated German translation
+
+M po/de.po
+
+commit 1085c645cb460753b42dc20f0376f38cd7e8d817
+Author: Ross Lagerwall
+Date: 2015-12-05
+
+ sftp: Fail cancelled jobs
+
+ Fail jobs which have been marked as cancelled, otherwise the job
+ remains
+ and blocks unmounting. This can be reproduced by cancelling while
+ copying a large file to/from a mount and then trying to unmount it.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=759061
+
+M daemon/gvfsbackendsftp.c
+
+commit 7c20c24de6d803963b96ee39df49e478a933c946
+Author: Ondrej Holy
+Date: 2015-12-10
+
+ metadata: Avoid endless recursion when copying meta files
+
+ meta_builder_copy is traversing the tree while at the same time
+ possibly
+ writing to it. This might leads to endless recursion and consequent
+ segmentation fault. Do the entire copy into a new MetaFile that is not
+ inserted into the source tree and consequently insert the MetaFile
+ once
+ the copy is done.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=759341
+
+M metadata/metabuilder.c
+
+commit c5a3b9cfa2125462b629891812d166d1d1bd6f80
+Author: Ondrej Holy
+Date: 2015-10-06
+
+ udisks2: Do not show notification if unmount failed
+
+ "You can now unplug..." notification is shown regardless of errors
+ currently. Error dialog is shown together with this notification.
+ Device might be still mounted and it might not be safe to unmount it.
+ Therefore show this notification only if there are no errors.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=746769
+
+M monitor/udisks2/gvfsudisks2drive.c
+M monitor/udisks2/gvfsudisks2mount.c
+M monitor/udisks2/gvfsudisks2utils.c
+M monitor/udisks2/gvfsudisks2utils.h
+
+commit 358214524e2925746944462189daf0e7f2ade8d1
+Author: Dmitry Eremin-Solenikov
+Date: 2015-11-10
+
+ daemon: Don't leak mountable_name
+
+ If the daemon code allocates a unique mountable_name, later this
+ string
+ is lost. Store and free it properly to remove the memory leak.
+
+ https://bugzilla.gnome.org/show_bug.cgi?id=757901
+
+ Signed-off-by: Dmitry Eremin-Solenikov
+ [oholy@redhat.com: commit message modification]
+ Signed-off-by: Ondrej Holy
+
+M daemon/daemon-main.c
+
+commit 7fc6980907025d4726f5da1b84d804f3b3dbcced
+Author: Ondrej Holy
+Date: 2015-11-09
+
+ Post release version bump
+
+M configure.ac
+
commit a8acc8177e476d5ef75ff3e2aa21d6ec0520c581
Author: Ondrej Holy
-Date: 2015-11-09
+Date: 2015-11-09
Update NEWS for 1.26.2 release
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/NEWS new/gvfs-1.26.3/NEWS
--- old/gvfs-1.26.2/NEWS 2015-11-09 13:33:15.000000000 +0100
+++ new/gvfs-1.26.3/NEWS 2016-02-18 13:54:44.000000000 +0100
@@ -1,3 +1,13 @@
+Major changes in 1.26.3
+=======================
+* udisks2: Avoid crashes during unmount
+* ftp: Fix cache invalidation after writing
+* network: Fix crashes when mount failed
+* metadata: Avoid endless recursion when copying meta files
+* udisks2: Do not show notification if unmount failed
+* Several smaller bugfixes
+* Translation updates
+
Major changes in 1.26.2
=======================
* Accept XDG_RUNTIME_DIR/bus as a valid D-Bus session/user bus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/common/gvfsdbus.c new/gvfs-1.26.3/common/gvfsdbus.c
--- old/gvfs-1.26.2/common/gvfsdbus.c 2015-11-09 13:35:23.000000000 +0100
+++ new/gvfs-1.26.3/common/gvfsdbus.c 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/common/gvfsdbus.h new/gvfs-1.26.3/common/gvfsdbus.h
--- old/gvfs-1.26.2/common/gvfsdbus.h 2015-11-09 13:35:23.000000000 +0100
+++ new/gvfs-1.26.3/common/gvfsdbus.h 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/configure.ac new/gvfs-1.26.3/configure.ac
--- old/gvfs-1.26.2/configure.ac 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/configure.ac 2016-02-18 13:54:44.000000000 +0100
@@ -1,6 +1,6 @@
AC_PREREQ([2.64])
-AC_INIT([gvfs],[1.26.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
+AC_INIT([gvfs],[1.26.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs])
AM_INIT_AUTOMAKE([1.11.1 no-dist-gzip dist-xz tar-ustar -Wno-portability])
AC_CONFIG_HEADERS(config.h)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/daemon/daemon-main.c new/gvfs-1.26.3/daemon/daemon-main.c
--- old/gvfs-1.26.2/daemon/daemon-main.c 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/daemon/daemon-main.c 2016-02-18 13:54:44.000000000 +0100
@@ -381,11 +381,11 @@
name_owner_id = 0;
/* We want to own *some* name on the org.gtk.vfs.* namespace so that
filtering for us works from a sandbox */
- if (mountable_name == NULL)
- mountable_name = g_strdup_printf ("org.gtk.vfs.mountpoint_%d", getpid ());
+ if (data->mountable_name == NULL)
+ data->mountable_name = g_strdup_printf ("org.gtk.vfs.mountpoint_%d", getpid ());
name_owner_id = g_bus_own_name (G_BUS_TYPE_SESSION,
- mountable_name,
+ data->mountable_name,
G_BUS_NAME_OWNER_FLAGS_NONE,
NULL,
on_name_acquired,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/daemon/gvfsbackendftp.c new/gvfs-1.26.3/daemon/gvfsbackendftp.c
--- old/gvfs-1.26.2/daemon/gvfsbackendftp.c 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/daemon/gvfsbackendftp.c 2016-02-18 13:54:44.000000000 +0100
@@ -928,6 +928,7 @@
const char *format,
...)
{
+ GVfsJobOpenForWrite *job = G_VFS_JOB_OPEN_FOR_WRITE (task->job);
va_list varargs;
/* FIXME: can we honour the flags? */
@@ -946,10 +947,16 @@
if (!g_vfs_ftp_task_is_in_error (task))
{
+ GIOStream *stream;
+
/* don't push the connection back, it's our handle now */
GVfsFtpConnection *conn = g_vfs_ftp_task_take_connection (task);
g_vfs_job_open_for_write_set_handle (G_VFS_JOB_OPEN_FOR_WRITE (task->job), conn);
g_vfs_job_open_for_write_set_can_seek (G_VFS_JOB_OPEN_FOR_WRITE (task->job), FALSE);
+
+ stream = g_vfs_ftp_connection_get_data_stream (conn);
+ g_object_set_data_full (G_OBJECT (stream), "g-vfs-backend-ftp-filename",
+ g_strdup (job->filename), g_free);
}
}
@@ -1086,12 +1093,22 @@
{
GVfsBackendFtp *ftp = G_VFS_BACKEND_FTP (backend);
GVfsFtpTask task = G_VFS_FTP_TASK_INIT (ftp, G_VFS_JOB (job));
+ GVfsFtpConnection *conn = handle;
+ GIOStream *stream;
+ const gchar *filename;
+ GVfsFtpFile *file;
- g_vfs_ftp_task_give_connection (&task, handle);
+ stream = g_vfs_ftp_connection_get_data_stream (conn);
+ filename = g_object_get_data (G_OBJECT (stream), "g-vfs-backend-ftp-filename");
+ file = g_vfs_ftp_file_new_from_gvfs (ftp, filename);
+ g_vfs_ftp_task_give_connection (&task, handle);
g_vfs_ftp_task_close_data_connection (&task);
g_vfs_ftp_task_receive (&task, 0, NULL);
+ g_vfs_ftp_dir_cache_purge_file (ftp->dir_cache, file);
+ g_vfs_ftp_file_free (file);
+
g_vfs_ftp_task_done (&task);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/daemon/gvfsbackendnetwork.c new/gvfs-1.26.3/daemon/gvfsbackendnetwork.c
--- old/gvfs-1.26.2/daemon/gvfsbackendnetwork.c 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/daemon/gvfsbackendnetwork.c 2016-02-18 13:54:44.000000000 +0100
@@ -299,7 +299,7 @@
}
}
- g_list_foreach (old_files, (GFunc)network_file_free, NULL);
+ g_list_free_full (old_files, (GDestroyNotify)network_file_free);
}
static void
@@ -652,7 +652,7 @@
{
g_signal_handlers_disconnect_by_func (backend->smb_monitor,
notify_smb_files_changed,
- backend->smb_monitor);
+ backend);
g_file_monitor_cancel (backend->smb_monitor);
g_object_unref (backend->smb_monitor);
backend->smb_monitor = NULL;
@@ -960,6 +960,28 @@
g_object_unref (backend->smb_settings);
if (backend->dnssd_settings)
g_object_unref (backend->dnssd_settings);
+ if (backend->dnssd_monitor)
+ {
+ g_signal_handlers_disconnect_by_func (backend->dnssd_monitor, notify_dnssd_local_changed, backend);
+ g_clear_object (&backend->dnssd_monitor);
+ }
+ if (backend->smb_monitor)
+ {
+ g_signal_handlers_disconnect_by_func (backend->smb_monitor, notify_smb_files_changed, backend);
+ g_clear_object (&backend->smb_monitor);
+ }
+ if (backend->idle_tag)
+ {
+ g_source_remove (backend->idle_tag);
+ backend->idle_tag = 0;
+ }
+ if (backend->files)
+ {
+ g_list_free_full (backend->files, (GDestroyNotify)network_file_free);
+ backend->files = NULL;
+ }
+ g_free (backend->current_workgroup);
+ g_free (backend->extra_domains);
if (G_OBJECT_CLASS (g_vfs_backend_network_parent_class)->finalize)
(*G_OBJECT_CLASS (g_vfs_backend_network_parent_class)->finalize) (object);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/daemon/gvfsbackendsftp.c new/gvfs-1.26.3/daemon/gvfsbackendsftp.c
--- old/gvfs-1.26.2/daemon/gvfsbackendsftp.c 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/daemon/gvfsbackendsftp.c 2016-02-18 13:54:44.000000000 +0100
@@ -5195,6 +5195,23 @@
return TRUE;
}
+/* Return true if the job is finished or cancelled, failing it if needed. */
+static gboolean
+check_finished_or_cancelled_job (GVfsJob *job)
+{
+ if (g_vfs_job_is_finished (job))
+ return TRUE;
+
+ if (g_vfs_job_is_cancelled (job))
+ {
+ g_vfs_job_failed (job, G_IO_ERROR, G_IO_ERROR_CANCELLED,
+ _("Operation was cancelled"));
+ return TRUE;
+ }
+
+ return FALSE;
+}
+
/* The push sliding window mechanism is based on the one in the OpenSSH sftp
* client. */
@@ -5457,7 +5474,7 @@
g_input_stream_close_finish (handle->in, res, NULL);
g_clear_object (&handle->in);
- if (g_vfs_job_is_finished (handle->job) || g_vfs_job_is_cancelled (handle->job))
+ if (check_finished_or_cancelled_job (handle->job))
{
sftp_push_handle_free (handle);
return;
@@ -5484,7 +5501,7 @@
handle->num_req--;
- if (g_vfs_job_is_finished (job) || g_vfs_job_is_cancelled (job))
+ if (check_finished_or_cancelled_job (job))
{
sftp_push_handle_free (handle);
return;
@@ -5534,7 +5551,7 @@
count = g_input_stream_read_finish (handle->in, res, &error);
- if (g_vfs_job_is_finished (handle->job) || g_vfs_job_is_cancelled (handle->job))
+ if (check_finished_or_cancelled_job (handle->job))
{
g_clear_error (&error);
sftp_push_handle_free (handle);
@@ -6201,7 +6218,7 @@
handle->num_req--;
- if (g_vfs_job_is_finished (job) || g_vfs_job_is_cancelled (job))
+ if (check_finished_or_cancelled_job (job))
{
}
else if (reply_type == SSH_FXP_STATUS)
@@ -6283,7 +6300,7 @@
{
SftpPullHandle *handle = user_data;
- if (g_vfs_job_is_finished (job) || g_vfs_job_is_cancelled (job))
+ if (check_finished_or_cancelled_job (job))
{
handle->size = PULL_SIZE_INVALID;
sftp_pull_handle_free (handle);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/metadata/metabuilder.c new/gvfs-1.26.3/metadata/metabuilder.c
--- old/gvfs-1.26.2/metadata/metabuilder.c 2015-11-05 12:20:57.000000000 +0100
+++ new/gvfs-1.26.3/metadata/metabuilder.c 2016-02-04 17:38:47.000000000 +0100
@@ -298,7 +298,7 @@
const char *dest_path,
guint64 mtime)
{
- MetaFile *src, *dest;
+ MetaFile *src, *dest, *temp;
meta_builder_remove (builder, dest_path, mtime);
@@ -306,9 +306,15 @@
if (src == NULL)
return;
+ temp = metafile_new (NULL, NULL);
+ meta_file_copy_into (src, temp, mtime);
+
dest = meta_builder_lookup (builder, dest_path, TRUE);
+ dest->data = temp->data;
+ dest->children = temp->children;
+ dest->last_changed = temp->last_changed;
- meta_file_copy_into (src, dest, mtime);
+ g_free (temp);
}
void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/metadata/metadata-dbus.c new/gvfs-1.26.3/metadata/metadata-dbus.c
--- old/gvfs-1.26.2/metadata/metadata-dbus.c 2015-11-09 13:35:23.000000000 +0100
+++ new/gvfs-1.26.3/metadata/metadata-dbus.c 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/metadata/metadata-dbus.h new/gvfs-1.26.3/metadata/metadata-dbus.h
--- old/gvfs-1.26.2/metadata/metadata-dbus.h 2015-11-09 13:35:23.000000000 +0100
+++ new/gvfs-1.26.3/metadata/metadata-dbus.h 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/proxy/gvfsvolumemonitordbus.c new/gvfs-1.26.3/monitor/proxy/gvfsvolumemonitordbus.c
--- old/gvfs-1.26.2/monitor/proxy/gvfsvolumemonitordbus.c 2015-11-09 13:35:25.000000000 +0100
+++ new/gvfs-1.26.3/monitor/proxy/gvfsvolumemonitordbus.c 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/proxy/gvfsvolumemonitordbus.h new/gvfs-1.26.3/monitor/proxy/gvfsvolumemonitordbus.h
--- old/gvfs-1.26.2/monitor/proxy/gvfsvolumemonitordbus.h 2015-11-09 13:35:25.000000000 +0100
+++ new/gvfs-1.26.3/monitor/proxy/gvfsvolumemonitordbus.h 2016-02-18 14:06:11.000000000 +0100
@@ -1,5 +1,5 @@
/*
- * Generated by gdbus-codegen 2.46.1. DO NOT EDIT.
+ * Generated by gdbus-codegen 2.47.5. DO NOT EDIT.
*
* The license of this code is the same as for the source it was derived from.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2drive.c new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2drive.c
--- old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2drive.c 2015-11-05 12:20:57.000000000 +0100
+++ new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2drive.c 2016-02-04 17:38:47.000000000 +0100
@@ -610,7 +610,7 @@
}
if (data->mount_operation != NULL)
- gvfs_udisks2_unmount_notify_stop (data->mount_operation);
+ gvfs_udisks2_unmount_notify_stop (data->mount_operation, error != NULL);
/* unmount failed; need to fail the whole eject operation */
simple = g_simple_async_result_new_from_error (G_OBJECT (data->drive),
@@ -707,7 +707,7 @@
if (error != NULL)
g_signal_emit_by_name (data->mount_operation, "aborted");
- gvfs_udisks2_unmount_notify_stop (data->mount_operation);
+ gvfs_udisks2_unmount_notify_stop (data->mount_operation, error != NULL);
}
g_simple_async_result_complete (data->simple);
@@ -849,7 +849,7 @@
if (error != NULL)
g_signal_emit_by_name (data->mount_operation, "aborted");
- gvfs_udisks2_unmount_notify_stop (data->mount_operation);
+ gvfs_udisks2_unmount_notify_stop (data->mount_operation, error != NULL);
}
g_simple_async_result_complete (data->simple);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2mount.c new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2mount.c
--- old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2mount.c 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2mount.c 2016-02-15 09:19:16.000000000 +0100
@@ -529,6 +529,7 @@
GSimpleAsyncResult *simple;
gboolean in_progress;
gboolean completed;
+ gboolean failed;
GVfsUDisks2Mount *mount;
@@ -601,7 +602,7 @@
{
if (data->mount_operation &&
!unmount_operation_is_eject (data->mount_operation))
- gvfs_udisks2_unmount_notify_stop (data->mount_operation);
+ gvfs_udisks2_unmount_notify_stop (data->mount_operation, data->failed);
if (complete_idle)
g_simple_async_result_complete_in_idle (data->simple);
@@ -651,6 +652,7 @@
G_IO_ERROR_FAILED_HANDLED,
"GMountOperation aborted (user should never see this "
"error since it is G_IO_ERROR_FAILED_HANDLED)");
+ data->failed = TRUE;
unmount_data_complete (data, TRUE);
}
else if (data->reply_result == G_MOUNT_OPERATION_HANDLED)
@@ -667,6 +669,7 @@
G_IO_ERROR,
G_IO_ERROR_BUSY,
_("One or more programs are preventing the unmount operation."));
+ data->failed = TRUE;
unmount_data_complete (data, TRUE);
}
}
@@ -689,7 +692,7 @@
data->reply_result = result;
data->reply_choice = choice;
data->reply_set = TRUE;
- if (!data->completed || !data->in_progress)
+ if (!data->completed && !data->in_progress)
mount_op_reply_handle (data);
}
@@ -843,7 +846,11 @@
if (!udisks_encrypted_call_lock_finish (encrypted,
res,
&error))
- g_simple_async_result_take_error (data->simple, error);
+ {
+ g_simple_async_result_take_error (data->simple, error);
+ data->failed = TRUE;
+ }
+
unmount_data_complete (data, FALSE);
}
@@ -870,6 +877,7 @@
goto out;
}
g_simple_async_result_take_error (data->simple, error);
+ data->failed = TRUE;
}
else
{
@@ -911,6 +919,7 @@
&error))
{
g_simple_async_result_take_error (data->simple, error);
+ data->failed = TRUE;
unmount_data_complete (data, FALSE);
goto out;
}
@@ -934,6 +943,7 @@
G_IO_ERROR,
G_IO_ERROR_FAILED,
"%s", standard_error);
+ data->failed = TRUE;
unmount_data_complete (data, FALSE);
out:
@@ -1039,7 +1049,7 @@
G_IO_ERROR,
G_IO_ERROR_FAILED,
"No object for D-Bus interface");
-
+ data->failed = TRUE;
unmount_data_complete (data, FALSE);
goto out;
}
@@ -1055,6 +1065,7 @@
G_IO_ERROR,
G_IO_ERROR_FAILED,
"No filesystem or encrypted interface on D-Bus object");
+ data->failed = TRUE;
unmount_data_complete (data, FALSE);
goto out;
}
@@ -1071,6 +1082,7 @@
G_IO_ERROR,
G_IO_ERROR_FAILED,
"No filesystem interface on D-Bus object for cleartext device");
+ data->failed = TRUE;
unmount_data_complete (data, FALSE);
goto out;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2utils.c new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2utils.c
--- old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2utils.c 2015-11-05 12:20:57.000000000 +0100
+++ new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2utils.c 2016-02-04 17:38:47.000000000 +0100
@@ -801,7 +801,8 @@
}
void
-gvfs_udisks2_unmount_notify_stop (GMountOperation *op)
+gvfs_udisks2_unmount_notify_stop (GMountOperation *op,
+ gboolean unmount_failed)
{
gchar *message, *name;
const gchar *format;
@@ -812,7 +813,7 @@
unmount_notify_stop_timer (data);
- if (data->op_aborted)
+ if (data->op_aborted || unmount_failed)
return;
name = unmount_notify_get_name (data);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2utils.h new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2utils.h
--- old/gvfs-1.26.2/monitor/udisks2/gvfsudisks2utils.h 2015-11-05 12:20:57.000000000 +0100
+++ new/gvfs-1.26.3/monitor/udisks2/gvfsudisks2utils.h 2016-02-04 17:38:47.000000000 +0100
@@ -57,7 +57,8 @@
GMount *mount,
GDrive *drive,
gboolean generic_text);
-void gvfs_udisks2_unmount_notify_stop (GMountOperation *op);
+void gvfs_udisks2_unmount_notify_stop (GMountOperation *op,
+ gboolean unmount_failed);
G_END_DECLS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gvfs-1.26.2/po/de.po new/gvfs-1.26.3/po/de.po
--- old/gvfs-1.26.2/po/de.po 2015-11-05 12:34:31.000000000 +0100
+++ new/gvfs-1.26.3/po/de.po 2016-02-18 13:54:44.000000000 +0100
@@ -10,7 +10,7 @@
# Mario Blättermann , 2009-2013.
# Paul Seyfert , 2011.
# Christian Kirbach , 2009, 2010, 2011, 2012, 2013.
-# Wolfgang Stöggl , 2014.
+# Wolfgang Stöggl , 2014, 2016.
# Bernd Homuth , 2015.
#
msgid ""
@@ -18,16 +18,16 @@
"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: 2015-09-21 19:02+0000\n"
-"PO-Revision-Date: 2015-09-22 21:10+0200\n"
-"Last-Translator: Bernd Homuth \n"
+"POT-Creation-Date: 2016-01-21 12:44+0000\n"
+"PO-Revision-Date: 2016-01-21 14:17+0100\n"
+"Last-Translator: Wolfgang Stoeggl \n"
"Language-Team: Deutsch \n"
"Language: de_DE\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: Gtranslator 2.91.6\n"
+"X-Generator: Poedit 1.8.6\n"
#: ../client/gdaemonfile.c:467 ../client/gdaemonfile.c:2863
msgid "Operation not supported, files on different mounts"
@@ -63,22 +63,22 @@
msgstr "Ungültiger Dateiname %s"
#: ../client/gdaemonfile.c:2663 ../client/gdaemonfile.c:2673
-#: ../client/gdaemonfile.c:2695 ../client/gdaemonvfs.c:1233
-#: ../client/gdaemonvfs.c:1254 ../client/gdaemonvfs.c:1265
-#: ../client/gdaemonvfs.c:1297
+#: ../client/gdaemonfile.c:2695 ../client/gdaemonvfs.c:1237
+#: ../client/gdaemonvfs.c:1258 ../client/gdaemonvfs.c:1269
+#: ../client/gdaemonvfs.c:1301
#, c-format
msgid "Error setting file metadata: %s"
msgstr "Fehler beim Setzen der Metadaten der Datei: %s"
-#: ../client/gdaemonfile.c:2664 ../client/gdaemonvfs.c:1255
+#: ../client/gdaemonfile.c:2664 ../client/gdaemonvfs.c:1259
msgid "can't open metadata tree"
msgstr "Metadaten-Baum kann nicht geöffnet werden"
-#: ../client/gdaemonfile.c:2674 ../client/gdaemonvfs.c:1266
+#: ../client/gdaemonfile.c:2674 ../client/gdaemonvfs.c:1270
msgid "can't get metadata proxy"
msgstr "Metadaten-Proxy nicht erreichbar"
-#: ../client/gdaemonfile.c:2696 ../client/gdaemonvfs.c:1298
+#: ../client/gdaemonfile.c:2696 ../client/gdaemonvfs.c:1302
msgid "values must be string or list of strings"
msgstr "Werte müssen Zeichenketten oder Listen aus Zeichenketten sein"
@@ -87,8 +87,7 @@
msgstr "Vorgang wird nicht unterstützt"
#: ../client/gdaemonfileenumerator.c:553 ../client/gdaemonfileenumerator.c:636
-#: ../client/gdaemonfileenumerator.c:687
-#: ../client/gdaemonfileinputstream.c:642
+#: ../client/gdaemonfileenumerator.c:687 ../client/gdaemonfileinputstream.c:642
#: ../client/gdaemonfileinputstream.c:795
#: ../client/gdaemonfileinputstream.c:915
#: ../client/gdaemonfileinputstream.c:1166
@@ -98,15 +97,15 @@
#: ../client/gdaemonfileoutputstream.c:919
#: ../client/gdaemonfileoutputstream.c:1085
#: ../client/gdaemonfileoutputstream.c:1267 ../client/gvfsdaemondbus.c:631
-#: ../daemon/gvfsbackendsmb.c:1266 ../daemon/gvfsbackendtest.c:92
-#: ../daemon/gvfsbackendtest.c:125 ../daemon/gvfsbackendtest.c:188
-#: ../daemon/gvfschannel.c:346 ../daemon/gvfsftptask.c:224
-#: ../monitor/gdu/ggdumount.c:1072 ../monitor/proxy/gproxydrive.c:547
-#: ../monitor/proxy/gproxydrive.c:635 ../monitor/proxy/gproxydrive.c:785
-#: ../monitor/proxy/gproxydrive.c:923 ../monitor/proxy/gproxydrive.c:961
-#: ../monitor/proxy/gproxydrive.c:1086 ../monitor/proxy/gproxymount.c:502
-#: ../monitor/proxy/gproxymount.c:587 ../monitor/proxy/gproxyvolume.c:862
-#: ../monitor/proxy/gproxyvolume.c:926
+#: ../daemon/gvfsbackendsftp.c:5208 ../daemon/gvfsbackendsmb.c:1266
+#: ../daemon/gvfsbackendtest.c:92 ../daemon/gvfsbackendtest.c:125
+#: ../daemon/gvfsbackendtest.c:188 ../daemon/gvfschannel.c:346
+#: ../daemon/gvfsftptask.c:224 ../monitor/gdu/ggdumount.c:1072
+#: ../monitor/proxy/gproxydrive.c:547 ../monitor/proxy/gproxydrive.c:635
+#: ../monitor/proxy/gproxydrive.c:785 ../monitor/proxy/gproxydrive.c:923
+#: ../monitor/proxy/gproxydrive.c:961 ../monitor/proxy/gproxydrive.c:1086
+#: ../monitor/proxy/gproxymount.c:502 ../monitor/proxy/gproxymount.c:587
+#: ../monitor/proxy/gproxyvolume.c:862 ../monitor/proxy/gproxyvolume.c:926
msgid "Operation was cancelled"
msgstr "Vorgang wurde abgebrochen"
@@ -139,7 +138,7 @@
msgid "Truncate not supported on stream"
msgstr "Abschneiden wird nicht auf einem Datenstrom unterstützt"
-#: ../client/gdaemonvfs.c:782
+#: ../client/gdaemonvfs.c:784
#, c-format
msgid "Error while getting mount info: %s"
msgstr "Fehler beim Abfragen von Informationen zum Speicherort: %s"
@@ -287,7 +286,7 @@
#: ../daemon/gvfsafpserver.c:428 ../daemon/gvfsafpserver.c:650
#: ../daemon/gvfsafpserver.c:826 ../daemon/gvfsafpserver.c:874
-#: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1674
+#: ../daemon/gvfsafpserver.c:990 ../daemon/gvfsafpserver.c:1675
#, c-format
msgid "Unable to connect to the server “%s”. A communication problem occurred."
msgstr ""
@@ -364,13 +363,13 @@
msgid "Unable to disconnect from the server."
msgstr "Verbindung zum Server kann nicht getrennt werden."
-#: ../daemon/gvfsafpserver.c:1366 ../daemon/gvfsafpserver.c:1765
+#: ../daemon/gvfsafpserver.c:1366 ../daemon/gvfsafpserver.c:1766
msgid "Unable to connect to the server. A communication problem occurred."
msgstr ""
"Verbindung mit dem Server ist nicht möglich. Es trat ein "
"Kommunikationsproblem auf."
-#: ../daemon/gvfsafpserver.c:1721
+#: ../daemon/gvfsafpserver.c:1722
msgid "Identification not found."
msgstr "Identifizierung wurde nicht gefunden"
@@ -400,8 +399,8 @@
#: ../daemon/gvfsafpvolume.c:1569 ../daemon/gvfsafpvolume.c:2015
#: ../daemon/gvfsafpvolume.c:2143 ../daemon/gvfsafpvolume.c:2305
#: ../daemon/gvfsafpvolume.c:2525 ../daemon/gvfsbackendafc.c:291
-#: ../daemon/gvfsbackendgoogle.c:207 ../daemon/gvfsbackendsftp.c:351
-#: ../daemon/gvfsbackendsftp.c:1090 ../daemon/gvfsbackendsftp.c:2109
+#: ../daemon/gvfsbackendgoogle.c:207 ../daemon/gvfsbackendsftp.c:345
+#: ../daemon/gvfsbackendsftp.c:1084 ../daemon/gvfsbackendsftp.c:2113
#: ../daemon/gvfsftptask.c:439
#, c-format
msgid "Permission denied"
@@ -430,9 +429,9 @@
#: ../daemon/gvfsbackendafp.c:1341 ../daemon/gvfsbackenddav.c:2291
#: ../daemon/gvfsbackenddav.c:2954 ../daemon/gvfsbackenddav.c:3234
#: ../daemon/gvfsbackendftp.c:815 ../daemon/gvfsbackendnfs.c:2476
-#: ../daemon/gvfsbackendsftp.c:2622 ../daemon/gvfsbackendsftp.c:3397
-#: ../daemon/gvfsbackendsftp.c:3725 ../daemon/gvfsbackendsftp.c:4789
-#: ../daemon/gvfsbackendsftp.c:5714
+#: ../daemon/gvfsbackendsftp.c:2628 ../daemon/gvfsbackendsftp.c:3403
+#: ../daemon/gvfsbackendsftp.c:3731 ../daemon/gvfsbackendsftp.c:4795
+#: ../daemon/gvfsbackendsftp.c:5737
msgid "File is directory"
msgstr "Datei ist ein Ordner"
@@ -446,7 +445,7 @@
#: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsbackendafc.c:222
#: ../daemon/gvfsbackendburn.c:421 ../daemon/gvfsbackenddav.c:2681
-#: ../daemon/gvfsbackendsftp.c:2103
+#: ../daemon/gvfsbackendsftp.c:2107
msgid "Directory not empty"
msgstr "Ordner ist nicht leer"
@@ -480,11 +479,11 @@
#: ../daemon/gvfsbackenddav.c:3001 ../daemon/gvfsbackenddav.c:3225
#: ../daemon/gvfsbackendftp.c:794 ../daemon/gvfsbackendftp.c:975
#: ../daemon/gvfsbackendftp.c:1475 ../daemon/gvfsbackendftp.c:1583
-#: ../daemon/gvfsbackendgoogle.c:1208 ../daemon/gvfsbackendgoogle.c:1537
-#: ../daemon/gvfsbackendgoogle.c:1809 ../daemon/gvfsbackendgoogle.c:2459
+#: ../daemon/gvfsbackendgoogle.c:1233 ../daemon/gvfsbackendgoogle.c:1561
+#: ../daemon/gvfsbackendgoogle.c:1834 ../daemon/gvfsbackendgoogle.c:2486
#: ../daemon/gvfsbackendmtp.c:1542 ../daemon/gvfsbackendmtp.c:1674
#: ../daemon/gvfsbackendmtp.c:2000 ../daemon/gvfsbackendnfs.c:2486
-#: ../daemon/gvfsbackendsftp.c:4798 ../daemon/gvfsbackendsmb.c:2207
+#: ../daemon/gvfsbackendsftp.c:4804 ../daemon/gvfsbackendsmb.c:2209
msgid "Target file already exists"
msgstr "Zieldatei existiert bereits"
@@ -646,13 +645,13 @@
#: ../daemon/gvfsbackendafc.c:443 ../daemon/gvfsbackend.c:994
#: ../monitor/gdu/ggdudrive.c:1024 ../monitor/gdu/ggdumount.c:923
-#: ../monitor/udisks2/gvfsudisks2mount.c:783
+#: ../monitor/udisks2/gvfsudisks2mount.c:786
msgid "Cancel"
msgstr "Abbrechen"
#: ../daemon/gvfsbackendafc.c:461 ../daemon/gvfsbackendarchive.c:645
#: ../daemon/gvfsbackendarchive.c:674 ../daemon/gvfsbackenddav.c:1848
-#: ../daemon/gvfsbackendgoogle.c:1640 ../daemon/gvfsbackendhttp.c:256
+#: ../daemon/gvfsbackendgoogle.c:1664 ../daemon/gvfsbackendhttp.c:256
#: ../daemon/gvfsbackendsmb.c:732
msgid "Invalid mount spec"
msgstr "Ungültige Mount-Spezifikation"
@@ -707,7 +706,7 @@
"klicken Sie auf »Erneut versuchen«."
#: ../daemon/gvfsbackendafc.c:1009 ../daemon/gvfsbackendarchive.c:752
-#: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgoogle.c:2159
+#: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgoogle.c:2186
#: ../daemon/gvfsbackendgphoto2.c:1820 ../daemon/gvfsbackendmtp.c:2218
#: ../daemon/gvfsbackendnfs.c:347 ../daemon/gvfsbackendrecent.c:122
#: ../daemon/gvfsbackendsmb.c:822 ../daemon/gvfsbackendtrash.c:234
@@ -727,23 +726,23 @@
#. * G_IO_ERROR_CANT_CREATE_BACKUP to proceed with the GIO
#. * fallback copy.
#.
-#: ../daemon/gvfsbackendafc.c:2433 ../daemon/gvfsbackendafp.c:1781
+#: ../daemon/gvfsbackendafc.c:2435 ../daemon/gvfsbackendafp.c:1781
#: ../daemon/gvfsbackendftp.c:1175 ../daemon/gvfsbackendftp.c:1223
-#: ../daemon/gvfsbackendftp.c:1244 ../daemon/gvfsbackendgoogle.c:1131
-#: ../daemon/gvfsbackendgoogle.c:1203 ../daemon/gvfsbackendgoogle.c:1286
-#: ../daemon/gvfsbackendgoogle.c:1354 ../daemon/gvfsbackendgoogle.c:1512
-#: ../daemon/gvfsbackendgoogle.c:1739 ../daemon/gvfsbackendgoogle.c:2375
-#: ../daemon/gvfsbackendgoogle.c:2430 ../daemon/gvfsbackendgoogle.c:2454
-#: ../daemon/gvfsbackendgoogle.c:2540 ../daemon/gvfsbackendmtp.c:1959
-#: ../daemon/gvfsbackendmtp.c:2185 ../daemon/gvfsbackendmtp.c:2443
-#: ../daemon/gvfsbackendmtp.c:2531 ../daemon/gvfsbackendmtp.c:2599
-#: ../daemon/gvfsbackendnfs.c:2368 ../daemon/gvfsbackendsftp.c:2107
-#: ../daemon/gvfsbackendsftp.c:5166 ../daemon/gvfsbackendsmb.c:1851
-#: ../daemon/gvfsftptask.c:431
+#: ../daemon/gvfsbackendftp.c:1244 ../daemon/gvfsbackendgoogle.c:1140
+#: ../daemon/gvfsbackendgoogle.c:1207 ../daemon/gvfsbackendgoogle.c:1228
+#: ../daemon/gvfsbackendgoogle.c:1310 ../daemon/gvfsbackendgoogle.c:1378
+#: ../daemon/gvfsbackendgoogle.c:1536 ../daemon/gvfsbackendgoogle.c:1764
+#: ../daemon/gvfsbackendgoogle.c:2402 ../daemon/gvfsbackendgoogle.c:2457
+#: ../daemon/gvfsbackendgoogle.c:2481 ../daemon/gvfsbackendgoogle.c:2567
+#: ../daemon/gvfsbackendmtp.c:1959 ../daemon/gvfsbackendmtp.c:2185
+#: ../daemon/gvfsbackendmtp.c:2443 ../daemon/gvfsbackendmtp.c:2531
+#: ../daemon/gvfsbackendmtp.c:2599 ../daemon/gvfsbackendnfs.c:2368
+#: ../daemon/gvfsbackendsftp.c:2111 ../daemon/gvfsbackendsftp.c:5172
+#: ../daemon/gvfsbackendsmb.c:1853 ../daemon/gvfsftptask.c:431
msgid "Operation unsupported"
msgstr "Vorgang wird nicht unterstützt"
-#: ../daemon/gvfsbackendafc.c:2599 ../daemon/gvfsbackenddav.c:2786
+#: ../daemon/gvfsbackendafc.c:2601 ../daemon/gvfsbackenddav.c:2786
#: ../daemon/gvfsbackendftp.c:1427
msgid "Backups not supported"
msgstr "Sicherheitskopien werden nicht unterstützt"
@@ -769,7 +768,7 @@
#. Translators: This is "<sharename> on <servername>" and is used as name for an SMB share
#: ../daemon/gvfsbackendafpbrowse.c:461 ../daemon/gvfsbackendafp.c:2104
#: ../daemon/gvfsbackendftp.c:672 ../daemon/gvfsbackendnfs.c:281
-#: ../daemon/gvfsbackendsftp.c:1964 ../daemon/gvfsbackendsmb.c:599
+#: ../daemon/gvfsbackendsftp.c:1968 ../daemon/gvfsbackendsmb.c:599
#: ../daemon/gvfsbackendsmb.c:1536
#, c-format
msgid "%s on %s"
@@ -783,7 +782,7 @@
#: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2139
#: ../daemon/gvfsbackendarchive.c:634 ../daemon/gvfsbackendftp.c:706
-#: ../daemon/gvfsbackendnfs.c:197 ../daemon/gvfsbackendsftp.c:2016
+#: ../daemon/gvfsbackendnfs.c:197 ../daemon/gvfsbackendsftp.c:2020
msgid "No hostname specified"
msgstr "Kein Server-Name angegeben"
@@ -793,22 +792,22 @@
#: ../daemon/gvfsbackendafp.c:286 ../daemon/gvfsbackendburn.c:875
#: ../daemon/gvfsbackenddav.c:2949 ../daemon/gvfsbackendftp.c:1575
-#: ../daemon/gvfsbackendgoogle.c:1781
+#: ../daemon/gvfsbackendgoogle.c:1806
msgid "Can't copy directory over directory"
msgstr "Ordner kann nicht über einen Ordner kopiert werden"
#: ../daemon/gvfsbackendafp.c:305 ../daemon/gvfsbackendburn.c:891
#: ../daemon/gvfsbackenddav.c:2978 ../daemon/gvfsbackendftp.c:1598
-#: ../daemon/gvfsbackendgoogle.c:1219 ../daemon/gvfsbackendgoogle.c:1800
-#: ../daemon/gvfsbackendgoogle.c:1820 ../daemon/gvfsbackendmtp.c:1657
+#: ../daemon/gvfsbackendgoogle.c:1244 ../daemon/gvfsbackendgoogle.c:1825
+#: ../daemon/gvfsbackendgoogle.c:1845 ../daemon/gvfsbackendmtp.c:1657
#: ../daemon/gvfsbackendmtp.c:1680 ../daemon/gvfsbackendmtp.c:1982
#: ../daemon/gvfsbackendmtp.c:2006
msgid "Can't recursively copy directory"
msgstr "Ordner kann nicht rekursiv kopiert werden"
#: ../daemon/gvfsbackendafp.c:489 ../daemon/gvfsbackenddav.c:2826
-#: ../daemon/gvfsbackendnfs.c:2470 ../daemon/gvfsbackendsftp.c:4784
-#: ../daemon/gvfsbackendsmb.c:2196
+#: ../daemon/gvfsbackendnfs.c:2470 ../daemon/gvfsbackendsftp.c:4790
+#: ../daemon/gvfsbackendsmb.c:2198
msgid "Can't move directory over directory"
msgstr "Ordner kann nicht über einen Ordner verschoben werden"
@@ -822,13 +821,13 @@
msgstr "Temporäre Datei kann nicht angelegt werden (%s)"
#: ../daemon/gvfsbackendafp.c:1348 ../daemon/gvfsbackenddav.c:2427
-#: ../daemon/gvfsbackendnfs.c:1175 ../daemon/gvfsbackendsftp.c:3740
+#: ../daemon/gvfsbackendnfs.c:1175 ../daemon/gvfsbackendsftp.c:3746
#: ../daemon/gvfsbackendsmb.c:1235
msgid "The file was externally modified"
msgstr "Die Datei wurde extern verändert"
#: ../daemon/gvfsbackendafp.c:1765 ../daemon/gvfsbackendftp.c:1216
-#: ../daemon/gvfsbackendsftp.c:5176
+#: ../daemon/gvfsbackendsftp.c:5182
msgid "Invalid attribute type (uint32 expected)"
msgstr "Ungültiger Typ des Attributs (uint32 erwartet)"
@@ -845,7 +844,7 @@
#. 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:356 ../daemon/gvfsbackendsftp.c:2558
+#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2564
#: ../daemon/gvfsftpdircache.c:431
#, c-format
msgid "/ on %s"
@@ -854,9 +853,9 @@
#: ../daemon/gvfsbackendarchive.c:889 ../daemon/gvfsbackendburn.c:679
#: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464
#: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendgoogle.c:684
-#: ../daemon/gvfsbackendgoogle.c:1188 ../daemon/gvfsbackendgoogle.c:1304
-#: ../daemon/gvfsbackendgoogle.c:1445 ../daemon/gvfsbackendnetwork.c:744
-#: ../daemon/gvfsbackendsftp.c:4276 ../daemon/gvfsftpdircache.c:157
+#: ../daemon/gvfsbackendgoogle.c:1213 ../daemon/gvfsbackendgoogle.c:1328
+#: ../daemon/gvfsbackendgoogle.c:1469 ../daemon/gvfsbackendnetwork.c:744
+#: ../daemon/gvfsbackendsftp.c:4282 ../daemon/gvfsftpdircache.c:157
#, c-format
msgid "The file is not a directory"
msgstr "Die Datei ist kein Ordner"
@@ -878,15 +877,15 @@
#: ../daemon/gvfsbackendgoogle.c:650 ../daemon/gvfsbackendgphoto2.c:1218
#: ../daemon/gvfsbackendgphoto2.c:2141 ../daemon/gvfsbackendgphoto2.c:2859
#: ../daemon/gvfsbackendrecent.c:106 ../daemon/gvfsbackendrecent.c:287
-#: ../daemon/gvfsbackendsftp.c:2111 ../daemon/gvfsbackendsftp.c:3274
-#: ../daemon/gvfsbackendsftp.c:3287 ../daemon/gvfsbackendsftp.c:3307
+#: ../daemon/gvfsbackendsftp.c:2115 ../daemon/gvfsbackendsftp.c:3280
+#: ../daemon/gvfsbackendsftp.c:3293 ../daemon/gvfsbackendsftp.c:3313
#: ../daemon/gvfsbackendtrash.c:218
#, c-format
msgid "No such file or directory"
msgstr "Unbekannte Datei oder unbekannter Ordner"
#: ../daemon/gvfsbackendburn.c:455 ../daemon/gvfsbackendburn.c:903
-#: ../daemon/gvfsbackendgoogle.c:1789
+#: ../daemon/gvfsbackendgoogle.c:1814
msgid "Can't copy file over directory"
msgstr "Datei kann nicht über einen Ordner kopiert werden"
@@ -902,8 +901,8 @@
msgid "File exists"
msgstr "Datei existiert bereits"
-#: ../daemon/gvfsbackendburn.c:827 ../daemon/gvfsjobcloseread.c:112
-#: ../daemon/gvfsjobclosewrite.c:120 ../daemon/gvfsjobcopy.c:121
+#: ../daemon/gvfsbackendburn.c:827 ../daemon/gvfsjobcloseread.c:113
+#: ../daemon/gvfsjobclosewrite.c:121 ../daemon/gvfsjobcopy.c:121
#: ../daemon/gvfsjobcreatemonitor.c:143 ../daemon/gvfsjobcreatemonitor.c:154
#: ../daemon/gvfsjobcreatemonitor.c:177 ../daemon/gvfsjobcreatemonitor.c:195
#: ../daemon/gvfsjobdelete.c:108 ../daemon/gvfsjobenumerate.c:272
@@ -915,15 +914,15 @@
#: ../daemon/gvfsjobpull.c:125 ../daemon/gvfsjobpush.c:125
#: ../daemon/gvfsjobqueryattributes.c:145 ../daemon/gvfsjobqueryfsinfo.c:116
#: ../daemon/gvfsjobqueryinfo.c:124 ../daemon/gvfsjobqueryinforead.c:119
-#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:120
-#: ../daemon/gvfsjobseekread.c:119 ../daemon/gvfsjobseekwrite.c:119
+#: ../daemon/gvfsjobqueryinfowrite.c:119 ../daemon/gvfsjobread.c:123
+#: ../daemon/gvfsjobseekread.c:121 ../daemon/gvfsjobseekwrite.c:121
#: ../daemon/gvfsjobsetattribute.c:130 ../daemon/gvfsjobsetdisplayname.c:111
#: ../daemon/gvfsjobstartmountable.c:113 ../daemon/gvfsjobstopmountable.c:115
-#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobtruncate.c:112
+#: ../daemon/gvfsjobtrash.c:107 ../daemon/gvfsjobtruncate.c:113
#: ../daemon/gvfsjobunmountmountable.c:157
-#: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:120
+#: ../daemon/gvfsjobunmountmountable.c:172 ../daemon/gvfsjobwrite.c:123
#: ../monitor/gdu/ggdumount.c:1176 ../monitor/gdu/ggdumount.c:1260
-#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1168
+#: ../monitor/gdu/ggduvolume.c:1617 ../monitor/udisks2/gvfsudisks2mount.c:1180
#: ../monitor/udisks2/gvfsudisks2volume.c:1677
msgid "Operation not supported by backend"
msgstr "Vorgang wird vom Backend nicht unterstützt"
@@ -933,7 +932,7 @@
msgstr "Keine solche Datei und kein solcher Ordner im Zielpfad"
#: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2864
-#: ../daemon/gvfsbackendsftp.c:2105 ../daemon/gvfsbackendsftp.c:4964
+#: ../daemon/gvfsbackendsftp.c:2109 ../daemon/gvfsbackendsftp.c:4970
msgid "Target file exists"
msgstr "Zieldatei existiert bereits"
@@ -943,9 +942,9 @@
#: ../daemon/gvfsbackendgphoto2.c:2819 ../daemon/gvfsbackendgphoto2.c:2912
#: ../daemon/gvfsbackendgphoto2.c:3521 ../daemon/gvfsbackendgphoto2.c:3531
#: ../daemon/gvfsbackendnfs.c:2418 ../daemon/gvfsbackendnfs.c:2544
-#: ../daemon/gvfsbackendsftp.c:5832 ../daemon/gvfsbackendsftp.c:5864
-#: ../daemon/gvfsbackendsftp.c:5890 ../daemon/gvfsbackendsftp.c:6362
-#: ../daemon/gvfsbackendsftp.c:6424
+#: ../daemon/gvfsbackendsftp.c:5855 ../daemon/gvfsbackendsftp.c:5887
+#: ../daemon/gvfsbackendsftp.c:5913 ../daemon/gvfsbackendsftp.c:6385
+#: ../daemon/gvfsbackendsftp.c:6447
msgid "Not supported"
msgstr "Nicht unterstützt"
@@ -955,13 +954,13 @@
msgstr "Dateisystem ist belegt"
#: ../daemon/gvfsbackend.c:993 ../monitor/gdu/ggdumount.c:922
-#: ../monitor/udisks2/gvfsudisks2mount.c:781
+#: ../monitor/udisks2/gvfsudisks2mount.c:784
msgid "Unmount Anyway"
msgstr "Trotzdem aushängen"
# CHECK
#: ../daemon/gvfsbackend.c:996 ../monitor/gdu/ggdumount.c:924
-#: ../monitor/udisks2/gvfsudisks2mount.c:784
+#: ../monitor/udisks2/gvfsudisks2mount.c:787
msgid ""
"Volume is busy\n"
"One or more applications are keeping the volume busy."
@@ -1135,7 +1134,7 @@
#. translators: %s here is the hostname
#. Translators: %s is the hostname
#: ../daemon/gvfsbackenddav.c:1565 ../daemon/gvfsbackendftp.c:529
-#: ../daemon/gvfsbackendsftp.c:1136
+#: ../daemon/gvfsbackendsftp.c:1130
#, c-format
msgid "Enter password for %s"
msgstr "Bitte Passwort für %s eingeben"
@@ -1154,10 +1153,10 @@
msgstr "Anfrage konnte nicht erstellt werden"
#: ../daemon/gvfsbackenddav.c:2458 ../daemon/gvfsbackendftp.c:1078
-#: ../daemon/gvfsbackendgoogle.c:2534 ../daemon/gvfsbackendnfs.c:939
+#: ../daemon/gvfsbackendgoogle.c:2561 ../daemon/gvfsbackendnfs.c:939
#: ../daemon/gvfsbackendnfs.c:962 ../daemon/gvfsbackendnfs.c:988
#: ../daemon/gvfsbackendnfs.c:1388 ../daemon/gvfsbackendsmb.c:1271
-#: ../daemon/gvfsbackendsmb.c:2224
+#: ../daemon/gvfsbackendsmb.c:2226
msgid "Backup file creation failed"
msgstr "Anlegen der Sicherheitskopie fehlgeschlagen"
@@ -1188,12 +1187,12 @@
msgstr "Netzwerk"
#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendftp.c:526 ../daemon/gvfsbackendsftp.c:1129
+#: ../daemon/gvfsbackendftp.c:526 ../daemon/gvfsbackendsftp.c:1123
#, c-format
msgid "Enter password for %s on %s"
msgstr "Bitte Passwort für %s auf %s eingeben"
-#: ../daemon/gvfsbackendftp.c:556 ../daemon/gvfsbackendsftp.c:1153
+#: ../daemon/gvfsbackendftp.c:556 ../daemon/gvfsbackendsftp.c:1147
#: ../daemon/gvfsbackendsmbbrowse.c:1037 ../daemon/gvfsbackendsmb.c:687
msgid "Password dialog cancelled"
msgstr "Passwortdialog abgebrochen"
@@ -1202,49 +1201,49 @@
msgid "Insufficient permissions"
msgstr "Unzureichende Zugriffsrechte"
-#: ../daemon/gvfsbackendgoogle.c:1689 ../daemon/gvfsbackendgoogle.c:2208
+#: ../daemon/gvfsbackendgoogle.c:1713 ../daemon/gvfsbackendgoogle.c:2235
#: ../daemon/gvfsbackendgphoto2.c:1861
msgid "Error getting data from file"
msgstr "Fehler beim Auslesen der Datei"
-#: ../daemon/gvfsbackendgoogle.c:2166 ../daemon/gvfsbackendsftp.c:2284
-#: ../daemon/gvfsbackendsftp.c:2689 ../daemon/gvfsbackendsftp.c:2752
-#: ../daemon/gvfsbackendsftp.c:2763 ../daemon/gvfsbackendsftp.c:2821
-#: ../daemon/gvfsbackendsftp.c:2914 ../daemon/gvfsbackendsftp.c:2966
-#: ../daemon/gvfsbackendsftp.c:3021 ../daemon/gvfsbackendsftp.c:3100
-#: ../daemon/gvfsbackendsftp.c:3217 ../daemon/gvfsbackendsftp.c:3350
-#: ../daemon/gvfsbackendsftp.c:3434 ../daemon/gvfsbackendsftp.c:3510
-#: ../daemon/gvfsbackendsftp.c:3522 ../daemon/gvfsbackendsftp.c:3582
-#: ../daemon/gvfsbackendsftp.c:3624 ../daemon/gvfsbackendsftp.c:3812
-#: ../daemon/gvfsbackendsftp.c:3846 ../daemon/gvfsbackendsftp.c:3904
-#: ../daemon/gvfsbackendsftp.c:3963 ../daemon/gvfsbackendsftp.c:4034
-#: ../daemon/gvfsbackendsftp.c:4309 ../daemon/gvfsbackendsftp.c:4380
-#: ../daemon/gvfsbackendsftp.c:4515 ../daemon/gvfsbackendsftp.c:4623
-#: ../daemon/gvfsbackendsftp.c:4685 ../daemon/gvfsbackendsftp.c:4722
-#: ../daemon/gvfsbackendsftp.c:4750 ../daemon/gvfsbackendsftp.c:4864
-#: ../daemon/gvfsbackendsftp.c:4920 ../daemon/gvfsbackendsftp.c:4961
-#: ../daemon/gvfsbackendsftp.c:4997 ../daemon/gvfsbackendsftp.c:5033
-#: ../daemon/gvfsbackendsftp.c:5048 ../daemon/gvfsbackendsftp.c:5063
-#: ../daemon/gvfsbackendsftp.c:5147 ../daemon/gvfsbackendsftp.c:5317
-#: ../daemon/gvfsbackendsftp.c:5354 ../daemon/gvfsbackendsftp.c:5428
-#: ../daemon/gvfsbackendsftp.c:5514 ../daemon/gvfsbackendsftp.c:5598
-#: ../daemon/gvfsbackendsftp.c:5641 ../daemon/gvfsbackendsftp.c:5645
-#: ../daemon/gvfsbackendsftp.c:5762 ../daemon/gvfsbackendsftp.c:5766
-#: ../daemon/gvfsbackendsftp.c:6004 ../daemon/gvfsbackendsftp.c:6217
-#: ../daemon/gvfsbackendsftp.c:6234 ../daemon/gvfsbackendsftp.c:6368
-#: ../daemon/gvfsbackendsftp.c:6396
+#: ../daemon/gvfsbackendgoogle.c:2193 ../daemon/gvfsbackendsftp.c:2288
+#: ../daemon/gvfsbackendsftp.c:2695 ../daemon/gvfsbackendsftp.c:2758
+#: ../daemon/gvfsbackendsftp.c:2769 ../daemon/gvfsbackendsftp.c:2827
+#: ../daemon/gvfsbackendsftp.c:2920 ../daemon/gvfsbackendsftp.c:2972
+#: ../daemon/gvfsbackendsftp.c:3027 ../daemon/gvfsbackendsftp.c:3106
+#: ../daemon/gvfsbackendsftp.c:3223 ../daemon/gvfsbackendsftp.c:3356
+#: ../daemon/gvfsbackendsftp.c:3440 ../daemon/gvfsbackendsftp.c:3516
+#: ../daemon/gvfsbackendsftp.c:3528 ../daemon/gvfsbackendsftp.c:3588
+#: ../daemon/gvfsbackendsftp.c:3630 ../daemon/gvfsbackendsftp.c:3818
+#: ../daemon/gvfsbackendsftp.c:3852 ../daemon/gvfsbackendsftp.c:3910
+#: ../daemon/gvfsbackendsftp.c:3969 ../daemon/gvfsbackendsftp.c:4040
+#: ../daemon/gvfsbackendsftp.c:4315 ../daemon/gvfsbackendsftp.c:4386
+#: ../daemon/gvfsbackendsftp.c:4521 ../daemon/gvfsbackendsftp.c:4629
+#: ../daemon/gvfsbackendsftp.c:4691 ../daemon/gvfsbackendsftp.c:4728
+#: ../daemon/gvfsbackendsftp.c:4756 ../daemon/gvfsbackendsftp.c:4870
+#: ../daemon/gvfsbackendsftp.c:4926 ../daemon/gvfsbackendsftp.c:4967
+#: ../daemon/gvfsbackendsftp.c:5003 ../daemon/gvfsbackendsftp.c:5039
+#: ../daemon/gvfsbackendsftp.c:5054 ../daemon/gvfsbackendsftp.c:5069
+#: ../daemon/gvfsbackendsftp.c:5153 ../daemon/gvfsbackendsftp.c:5340
+#: ../daemon/gvfsbackendsftp.c:5377 ../daemon/gvfsbackendsftp.c:5451
+#: ../daemon/gvfsbackendsftp.c:5537 ../daemon/gvfsbackendsftp.c:5621
+#: ../daemon/gvfsbackendsftp.c:5664 ../daemon/gvfsbackendsftp.c:5668
+#: ../daemon/gvfsbackendsftp.c:5785 ../daemon/gvfsbackendsftp.c:5789
+#: ../daemon/gvfsbackendsftp.c:6027 ../daemon/gvfsbackendsftp.c:6240
+#: ../daemon/gvfsbackendsftp.c:6257 ../daemon/gvfsbackendsftp.c:6391
+#: ../daemon/gvfsbackendsftp.c:6419
msgid "Invalid reply received"
msgstr "Ungültige Antwort erhalten"
-#: ../daemon/gvfsbackendgoogle.c:2561 ../daemon/gvfsbackendnfs.c:1150
+#: ../daemon/gvfsbackendgoogle.c:2588 ../daemon/gvfsbackendnfs.c:1150
msgid "Target file is a directory"
msgstr "Die Zieldatei ist ein Ordner"
-#: ../daemon/gvfsbackendgoogle.c:2569 ../daemon/gvfsbackendnfs.c:1160
+#: ../daemon/gvfsbackendgoogle.c:2596 ../daemon/gvfsbackendnfs.c:1160
msgid "Target file is not a regular file"
msgstr "Die Zieldatei ist keine normale Datei"
-#: ../daemon/gvfsbackendgoogle.c:2759 ../daemon/gvfsbackendgphoto2.c:3321
+#: ../daemon/gvfsbackendgoogle.c:2786 ../daemon/gvfsbackendgphoto2.c:3321
msgid "Error writing file"
msgstr "Fehler beim Schreiben der Datei"
@@ -1357,7 +1356,7 @@
msgid "Error seeking in stream on camera %s"
msgstr "Fehler beim Durchlaufen des Datenstroms auf Kamera %s"
-#: ../daemon/gvfsbackendgphoto2.c:2135 ../daemon/gvfsbackendsftp.c:3277
+#: ../daemon/gvfsbackendgphoto2.c:2135 ../daemon/gvfsbackendsftp.c:3283
#: ../daemon/gvfsbackendsmbbrowse.c:1465
msgid "Not a directory"
msgstr "Kein Ordner"
@@ -1560,8 +1559,8 @@
"ein privilegierter Port wird erwartet"
#: ../daemon/gvfsbackendnfs.c:1046 ../daemon/gvfsbackendnfs.c:1069
-#: ../daemon/gvfsbackendnfs.c:1117 ../daemon/gvfsbackendsftp.c:3660
-#: ../daemon/gvfsbackendsftp.c:5669
+#: ../daemon/gvfsbackendnfs.c:1117 ../daemon/gvfsbackendsftp.c:3666
+#: ../daemon/gvfsbackendsftp.c:5692
msgid "Unable to create temporary file"
msgstr "Temporäre Datei konnte nicht erzeugt werden"
@@ -1579,73 +1578,73 @@
msgid "Recent"
msgstr "Zuletzt verwendet"
-#: ../daemon/gvfsbackendsftp.c:342 ../daemon/gvfsbackendsftp.c:709
+#: ../daemon/gvfsbackendsftp.c:336 ../daemon/gvfsbackendsftp.c:703
msgid "Connection failed"
msgstr "Verbindung fehlgeschlagen"
-#: ../daemon/gvfsbackendsftp.c:358
+#: ../daemon/gvfsbackendsftp.c:352
msgid "Hostname not known"
msgstr "Unbekannter Server-Name"
-#: ../daemon/gvfsbackendsftp.c:365
+#: ../daemon/gvfsbackendsftp.c:359
msgid "No route to host"
msgstr "Keine Verbindung zum Server"
-#: ../daemon/gvfsbackendsftp.c:373
+#: ../daemon/gvfsbackendsftp.c:367
msgid "Connection refused by server"
msgstr "Verbindung wurde vom Server verweigert"
-#: ../daemon/gvfsbackendsftp.c:380
+#: ../daemon/gvfsbackendsftp.c:374
msgid "Host key verification failed"
msgstr "Überprüfung des Server-Schlüssels fehlgeschlagen"
-#: ../daemon/gvfsbackendsftp.c:553
+#: ../daemon/gvfsbackendsftp.c:547
msgid "Unable to spawn SSH program"
msgstr "Das SSH-Programm konnte nicht gestartet werden"
-#: ../daemon/gvfsbackendsftp.c:569
+#: ../daemon/gvfsbackendsftp.c:563
#, c-format
msgid "Unable to spawn SSH program: %s"
msgstr "Das SSH-Programm konnte nicht gestartet werden: %s"
-#: ../daemon/gvfsbackendsftp.c:671 ../daemon/gvfsbackendsftp.c:1024
+#: ../daemon/gvfsbackendsftp.c:665 ../daemon/gvfsbackendsftp.c:1018
msgid "Timed out when logging in"
msgstr "Zeitüberschreitung beim Anmelden"
-#: ../daemon/gvfsbackendsftp.c:898
+#: ../daemon/gvfsbackendsftp.c:892
msgid "Log In Anyway"
msgstr "Dennoch anmelden"
-#: ../daemon/gvfsbackendsftp.c:898
+#: ../daemon/gvfsbackendsftp.c:892
msgid "Cancel Login"
msgstr "Anmelden abbrechen"
-#: ../daemon/gvfsbackendsftp.c:913
+#: ../daemon/gvfsbackendsftp.c:907
msgid "Login dialog cancelled"
msgstr "Anmeldedialog abgebrochen"
-#: ../daemon/gvfsbackendsftp.c:932
+#: ../daemon/gvfsbackendsftp.c:926
msgid "Can't send host identity confirmation"
msgstr "Identitätsbestätigung konnte nicht gesendet werden"
#. Translators: the first %s is the username, the second the host name
-#: ../daemon/gvfsbackendsftp.c:1126
+#: ../daemon/gvfsbackendsftp.c:1120
#, c-format
msgid "Enter passphrase for secure key for %s on %s"
msgstr ""
"Bitte geben Sie die Passphrase für den sicheren Schlüssel für %s auf %s ein"
#. Translators: %s is the hostname
-#: ../daemon/gvfsbackendsftp.c:1133
+#: ../daemon/gvfsbackendsftp.c:1127
#, c-format
msgid "Enter passphrase for secure key for %s"
msgstr "Bitte geben Sie die Passphrase für den sicheren Schlüssel für %s ein"
-#: ../daemon/gvfsbackendsftp.c:1225
+#: ../daemon/gvfsbackendsftp.c:1219
msgid "Can't send password"
msgstr "Passwort kann nicht gesendet werden"
-#: ../daemon/gvfsbackendsftp.c:1241
+#: ../daemon/gvfsbackendsftp.c:1235
#, c-format
msgid ""
"Can't verify the identity of “%s”.\n"
@@ -1662,7 +1661,7 @@
"dem Fortfahren absolut sicher gehen wollen, dann kontaktieren Sie Ihren "
"Systemverwalter."
-#: ../daemon/gvfsbackendsftp.c:1268
+#: ../daemon/gvfsbackendsftp.c:1262
#, c-format
msgid ""
"The host key for “%s” differs from the key for the IP address “%s”\n"
@@ -1674,41 +1673,41 @@
"Wenn Sie vor dem Fortfahren absolut sicher gehen wollen, dann kontaktieren "
"Sie Ihren Systemverwalter."
-#: ../daemon/gvfsbackendsftp.c:1351
+#: ../daemon/gvfsbackendsftp.c:1353
#, c-format
msgid "The connection is closed (the underlying SSH process exited)"
msgstr ""
"Die Verbindung ist geschlossen (der darunter liegende SSH-Prozess wurde "
"beendet)"
-#: ../daemon/gvfsbackendsftp.c:1352
+#: ../daemon/gvfsbackendsftp.c:1354
#, c-format
msgid "Internal error: Unknown Error"
msgstr "Interner Fehler: Unbekannter Fehler"
-#: ../daemon/gvfsbackendsftp.c:1864 ../daemon/gvfsbackendsftp.c:1891
+#: ../daemon/gvfsbackendsftp.c:1868 ../daemon/gvfsbackendsftp.c:1895
msgid "Protocol error"
msgstr "Protokollfehler"
-#: ../daemon/gvfsbackendsftp.c:2006
+#: ../daemon/gvfsbackendsftp.c:2010
msgid "Unable to find supported SSH command"
msgstr "Es konnte kein unterstützter SSH-Befehl gefunden werden"
-#: ../daemon/gvfsbackendsftp.c:2546 ../daemon/gvfsbackendsmb.c:1543
+#: ../daemon/gvfsbackendsftp.c:2552 ../daemon/gvfsbackendsmb.c:1543
#: ../daemon/gvfsdaemonutils.c:140
msgid " (invalid encoding)"
msgstr " (ungültige Kodierung)"
-#: ../daemon/gvfsbackendsftp.c:2631
+#: ../daemon/gvfsbackendsftp.c:2637
msgid "Failure"
msgstr "Fehler"
-#: ../daemon/gvfsbackendsftp.c:3043
+#: ../daemon/gvfsbackendsftp.c:3049
#, c-format
msgid "Error creating backup file: %s"
msgstr "Fehler beim Anlegen der Sicherheitskopie: %s"
-#: ../daemon/gvfsbackendsftp.c:3610 ../daemon/gvfsbackendsftp.c:3786
+#: ../daemon/gvfsbackendsftp.c:3616 ../daemon/gvfsbackendsftp.c:3792
msgid "backups not supported yet"
msgstr "Sicherheitskopien werden derzeit nicht unterstützt"
@@ -1759,34 +1758,34 @@
msgid "Backup file creation failed: %s"
msgstr "Anlegen der Sicherheitskopie fehlgeschlagen: %s"
-#: ../daemon/gvfsbackendsmb.c:1876
+#: ../daemon/gvfsbackendsmb.c:1878
msgid "Invalid attribute type (uint64 expected)"
msgstr "Ungültiger Typ des Attributs (uint64 erwartet)"
-#: ../daemon/gvfsbackendsmb.c:2047
+#: ../daemon/gvfsbackendsmb.c:2049
msgid "Can't rename file, filename already exists"
msgstr "Datei kann nicht umbenannt werden, Dateiname existiert bereits"
-#: ../daemon/gvfsbackendsmb.c:2098
+#: ../daemon/gvfsbackendsmb.c:2100
#, c-format
msgid "Error deleting file: %s"
msgstr "Fehler beim Löschen der Datei: %s"
-#: ../daemon/gvfsbackendsmb.c:2172
+#: ../daemon/gvfsbackendsmb.c:2174
#, c-format
msgid "Error moving file: %s"
msgstr "Fehler beim Verschieben der Datei: %s"
-#: ../daemon/gvfsbackendsmb.c:2244
+#: ../daemon/gvfsbackendsmb.c:2246
#, c-format
msgid "Error removing target file: %s"
msgstr "Fehler beim Löschen der Zieldatei: %s"
-#: ../daemon/gvfsbackendsmb.c:2268
+#: ../daemon/gvfsbackendsmb.c:2270
msgid "Can't recursively move directory"
msgstr "Ordner kann nicht rekursiv verschoben werden"
-#: ../daemon/gvfsbackendsmb.c:2314
+#: ../daemon/gvfsbackendsmb.c:2316
msgid "Windows Shares File System Service"
msgstr "Dateisystem-Dienst für Windows-Freigaben"
@@ -1934,7 +1933,7 @@
msgid "Invalid dbus message"
msgstr "Ungültige DBus-Nachricht"
-#: ../daemon/gvfsjobunmount.c:123 ../monitor/udisks2/gvfsudisks2utils.c:820
+#: ../daemon/gvfsjobunmount.c:123 ../monitor/udisks2/gvfsudisks2utils.c:821
#, c-format
msgid "%s has been unmounted\n"
msgstr "»%s« wurde ausgehängt\n"
@@ -2081,7 +2080,7 @@
msgid "Start Anyway"
msgstr "Trotzdem starten"
-#: ../monitor/gdu/ggdumount.c:857 ../monitor/udisks2/gvfsudisks2mount.c:669
+#: ../monitor/gdu/ggdumount.c:857 ../monitor/udisks2/gvfsudisks2mount.c:671
msgid "One or more programs are preventing the unmount operation."
msgstr "Ein oder mehrere Programme verhindern das Aushängen."
@@ -2465,7 +2464,7 @@
#. Note that the GUI (Shell, Files) currently use the term
#. * "Eject" for both GDrive.stop() and GDrive.eject().
#.
-#: ../monitor/udisks2/gvfsudisks2mount.c:777
+#: ../monitor/udisks2/gvfsudisks2mount.c:780
msgid "Eject Anyway"
msgstr "Trotzdem auswerfen"
@@ -2483,10 +2482,12 @@
"Daten werden auf %s geschrieben\n"
"Stecken Sie nicht vor Abschluss des Vorgangs aus"
-#: ../monitor/udisks2/gvfsudisks2utils.c:820
+# Ausstecken passt zwar häufig, nicht aber für CDROM: Sie dürfen jetzt XY CDROM ausstecken.
+# Daher »entfernen« gewählt.
+#: ../monitor/udisks2/gvfsudisks2utils.c:821
#, c-format
msgid "You can now unplug %s\n"
-msgstr "Sie dürfen jetzt %s ausstecken\n"
+msgstr "Sie dürfen jetzt %s entfernen\n"
#. Translators: This is used for encrypted volumes.
#. * The first %s is the formatted size (e.g. "42.0 MB").