Hello community, here is the log from the commit of package gvfs for openSUSE:Factory checked in at 2018-03-08 10:53:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gvfs (Old) and /work/SRC/openSUSE:Factory/.gvfs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gvfs" Thu Mar 8 10:53:04 2018 rev:146 rq:583412 version:1.34.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/gvfs/gvfs.changes 2018-02-07 18:38:58.695026604 +0100 +++ /work/SRC/openSUSE:Factory/.gvfs.new/gvfs.changes 2018-03-08 10:53:06.382825905 +0100 @@ -1,0 +2,7 @@ +Tue Mar 6 13:50:21 UTC 2018 - bjorn....@gmail.com + +- Update to version 1.34.2.1: + + mtp: Prevent crashes if device is unplugged during mount + operation. + +------------------------------------------------------------------- Old: ---- gvfs-1.34.2.tar.xz New: ---- gvfs-1.34.2.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gvfs.spec ++++++ --- /var/tmp/diff_new_pack.8iOARh/_old 2018-03-08 10:53:07.210796098 +0100 +++ /var/tmp/diff_new_pack.8iOARh/_new 2018-03-08 10:53:07.210796098 +0100 @@ -19,15 +19,14 @@ %define with_udisks2 1 %define with_cdda 1 Name: gvfs -Version: 1.34.2 +Version: 1.34.2.1 Release: 0 Summary: Virtual File System functionality for GLib License: LGPL-2.0+ AND GPL-3.0 Group: Development/Libraries/C and C++ -Url: http://www.gnome.org +URL: http://www.gnome.org Source0: http://download.gnome.org/sources/gvfs/1.34/%{name}-%{version}.tar.xz Source99: baselibs.conf - # PATCH-FEATURE-SLE gvfs-nvvfs.patch ksam...@novell.com -- Provides gvfs backend for novell nautilus plugin Patch5: gvfs-nvvfs.patch # PATCH-FEATURE-SLE gvfs-nds.patch ksam...@novell.com -- Provides NDS browsing for nautilus @@ -97,7 +96,7 @@ %package backend-afc Summary: VFS functionality for GLib -- iPod / iPhone Support -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Supplements: packageand(%{name}:%(rpm -q --qf "%%{name}" -f $(readlink -f %{_libdir}/llibimobiledevice.so))) @@ -107,7 +106,7 @@ %package backend-samba Summary: VFS functionality for GLib -- Samba Support -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-backends = %{version} @@ -133,7 +132,7 @@ %package fuse Summary: VFS functionality for GLib -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: System/Filesystems Requires: %{name} = %{version} Requires: fuse @@ -149,7 +148,7 @@ %package devel Summary: Development files for the GNOME Virtual file system -License: LGPL-2.0+ +License: LGPL-2.0-or-later Group: Development/Libraries/C and C++ Requires: %{name} = %{version} ++++++ gvfs-1.34.2.tar.xz -> gvfs-1.34.2.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/NEWS new/gvfs-1.34.2.1/NEWS --- old/gvfs-1.34.2/NEWS 2018-02-06 09:56:18.000000000 +0100 +++ new/gvfs-1.34.2.1/NEWS 2018-03-05 13:16:28.000000000 +0100 @@ -1,3 +1,7 @@ +Major changes in 1.34.2.1 +========================= +* mtp: Prevent crashes if device is unplugged during mount operation + Major changes in 1.34.2 ======================= * recent: Prevent crash when recent file changed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/common/gvfsdbus.c new/gvfs-1.34.2.1/common/gvfsdbus.c --- old/gvfs-1.34.2/common/gvfsdbus.c 2018-02-06 09:59:28.000000000 +0100 +++ new/gvfs-1.34.2.1/common/gvfsdbus.c 2018-03-05 13:20:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/common/gvfsdbus.h new/gvfs-1.34.2.1/common/gvfsdbus.h --- old/gvfs-1.34.2/common/gvfsdbus.h 2018-02-06 09:59:28.000000000 +0100 +++ new/gvfs-1.34.2.1/common/gvfsdbus.h 2018-03-05 13:20:43.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/compile new/gvfs-1.34.2.1/compile --- old/gvfs-1.34.2/compile 2018-02-06 09:59:06.000000000 +0100 +++ new/gvfs-1.34.2.1/compile 2018-03-05 13:20:29.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/config.guess new/gvfs-1.34.2.1/config.guess --- old/gvfs-1.34.2/config.guess 2018-02-06 09:59:06.000000000 +0100 +++ new/gvfs-1.34.2.1/config.guess 2018-03-05 13:20:29.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2017 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/config.sub new/gvfs-1.34.2.1/config.sub --- old/gvfs-1.34.2/config.sub 2018-02-06 09:59:06.000000000 +0100 +++ new/gvfs-1.34.2.1/config.sub 2018-03-05 13:20:29.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Configuration validation subroutine script. # Copyright 1992-2017 Free Software Foundation, Inc. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/configure new/gvfs-1.34.2.1/configure --- old/gvfs-1.34.2/configure 2018-02-06 09:59:04.000000000 +0100 +++ new/gvfs-1.34.2.1/configure 2018-03-05 13:20:28.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gvfs 1.34.2. +# Generated by GNU Autoconf 2.69 for gvfs 1.34.2.1. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gvfs' PACKAGE_TARNAME='gvfs' -PACKAGE_VERSION='1.34.2' -PACKAGE_STRING='gvfs 1.34.2' +PACKAGE_VERSION='1.34.2.1' +PACKAGE_STRING='gvfs 1.34.2.1' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs' PACKAGE_URL='' @@ -1594,7 +1594,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures gvfs 1.34.2 to adapt to many kinds of systems. +\`configure' configures gvfs 1.34.2.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1664,7 +1664,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gvfs 1.34.2:";; + short | recursive ) echo "Configuration of gvfs 1.34.2.1:";; esac cat <<\_ACEOF @@ -1929,7 +1929,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gvfs configure 1.34.2 +gvfs configure 1.34.2.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2455,7 +2455,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by gvfs $as_me 1.34.2, which was +It was created by gvfs $as_me 1.34.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3319,7 +3319,7 @@ # Define the identity of the package. PACKAGE='gvfs' - VERSION='1.34.2' + VERSION='1.34.2.1' cat >>confdefs.h <<_ACEOF @@ -21931,7 +21931,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by gvfs $as_me 1.34.2, which was +This file was extended by gvfs $as_me 1.34.2.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21997,7 +21997,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -gvfs config.status 1.34.2 +gvfs config.status 1.34.2.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/configure.ac new/gvfs-1.34.2.1/configure.ac --- old/gvfs-1.34.2/configure.ac 2018-02-06 09:50:48.000000000 +0100 +++ new/gvfs-1.34.2.1/configure.ac 2018-03-05 13:19:50.000000000 +0100 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) -AC_INIT([gvfs],[1.34.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs]) +AC_INIT([gvfs],[1.34.2.1],[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' old/gvfs-1.34.2/daemon/gvfsbackendmtp.c new/gvfs-1.34.2.1/daemon/gvfsbackendmtp.c --- old/gvfs-1.34.2/daemon/gvfsbackendmtp.c 2018-02-06 09:50:48.000000000 +0100 +++ new/gvfs-1.34.2.1/daemon/gvfsbackendmtp.c 2018-03-05 13:14:55.000000000 +0100 @@ -914,14 +914,14 @@ op_backend->volume_symbolic_icon = g_vfs_get_volume_symbolic_icon (device); g_object_unref (device); - g_signal_connect (op_backend->gudev_client, "uevent", G_CALLBACK (on_uevent), op_backend); - - op_backend->file_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); - LIBMTP_Init (); get_device (backend, host, G_VFS_JOB (job)); if (!G_VFS_JOB (job)->failed) { + g_signal_connect (op_backend->gudev_client, "uevent", G_CALLBACK (on_uevent), op_backend); + + op_backend->file_cache = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); + GMountSpec *mtp_mount_spec = g_mount_spec_new ("mtp"); g_mount_spec_set (mtp_mount_spec, "host", host); g_vfs_backend_set_mount_spec (backend, mtp_mount_spec); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/daemon/gvfsdaemon.c new/gvfs-1.34.2.1/daemon/gvfsdaemon.c --- old/gvfs-1.34.2/daemon/gvfsdaemon.c 2018-02-06 09:50:48.000000000 +0100 +++ new/gvfs-1.34.2.1/daemon/gvfsdaemon.c 2018-03-05 13:11:59.000000000 +0100 @@ -1069,6 +1069,8 @@ GArray *processes; GList *l; + g_mutex_lock (&daemon->lock); + processes = g_array_new (FALSE, FALSE, sizeof (GPid)); for (l = daemon->job_sources; l != NULL; l = l->next) { @@ -1080,6 +1082,8 @@ } } + g_mutex_unlock (&daemon->lock); + return processes; } @@ -1124,8 +1128,12 @@ { GList *l; - for (l = daemon->job_sources; l != NULL; l = l->next) - if (G_VFS_IS_CHANNEL (l->data) && - g_vfs_channel_get_backend (G_VFS_CHANNEL (l->data)) == backend) - g_vfs_channel_force_close (G_VFS_CHANNEL (l->data)); + g_mutex_lock (&daemon->lock); + + for (l = daemon->job_sources; l != NULL; l = l->next) + if (G_VFS_IS_CHANNEL (l->data) && + g_vfs_channel_get_backend (G_VFS_CHANNEL (l->data)) == backend) + g_vfs_channel_force_close (G_VFS_CHANNEL (l->data)); + + g_mutex_unlock (&daemon->lock); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/depcomp new/gvfs-1.34.2.1/depcomp --- old/gvfs-1.34.2/depcomp 2018-02-06 09:59:08.000000000 +0100 +++ new/gvfs-1.34.2.1/depcomp 2018-03-05 13:20:31.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # depcomp - compile a program generating dependencies as side-effects scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/metadata/metadata-dbus.c new/gvfs-1.34.2.1/metadata/metadata-dbus.c --- old/gvfs-1.34.2/metadata/metadata-dbus.c 2018-02-06 09:59:29.000000000 +0100 +++ new/gvfs-1.34.2.1/metadata/metadata-dbus.c 2018-03-05 13:02:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/metadata/metadata-dbus.h new/gvfs-1.34.2.1/metadata/metadata-dbus.h --- old/gvfs-1.34.2/metadata/metadata-dbus.h 2018-02-06 09:59:29.000000000 +0100 +++ new/gvfs-1.34.2.1/metadata/metadata-dbus.h 2018-03-05 13:02:25.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/missing new/gvfs-1.34.2.1/missing --- old/gvfs-1.34.2/missing 2018-02-06 09:59:06.000000000 +0100 +++ new/gvfs-1.34.2.1/missing 2018-03-05 13:20:29.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. scriptversion=2016-01-11.22; # UTC diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/monitor/proxy/gvfsvolumemonitordbus.c new/gvfs-1.34.2.1/monitor/proxy/gvfsvolumemonitordbus.c --- old/gvfs-1.34.2/monitor/proxy/gvfsvolumemonitordbus.c 2018-02-06 09:59:31.000000000 +0100 +++ new/gvfs-1.34.2.1/monitor/proxy/gvfsvolumemonitordbus.c 2018-03-05 13:03:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/monitor/proxy/gvfsvolumemonitordbus.h new/gvfs-1.34.2.1/monitor/proxy/gvfsvolumemonitordbus.h --- old/gvfs-1.34.2/monitor/proxy/gvfsvolumemonitordbus.h 2018-02-06 09:59:31.000000000 +0100 +++ new/gvfs-1.34.2.1/monitor/proxy/gvfsvolumemonitordbus.h 2018-03-05 13:03:11.000000000 +0100 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.55.1. DO NOT EDIT. + * Generated by gdbus-codegen 2.55.2. DO NOT EDIT. * * The license of this code is the same as for the D-Bus interface description * it was derived from. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/po/gvfs.pot new/gvfs-1.34.2.1/po/gvfs.pot --- old/gvfs-1.34.2/po/gvfs.pot 2018-02-06 09:59:34.000000000 +0100 +++ new/gvfs-1.34.2.1/po/gvfs.pot 2018-03-05 13:03:21.000000000 +0100 @@ -1,15 +1,14 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR gvfs contributors +# Copyright (C) YEAR Free Software Foundation, Inc. # This file is distributed under the same license as the gvfs package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: gvfs 1.34.2\n" -"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?"; -"product=gvfs&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2018-02-06 09:59+0100\n" +"Project-Id-Version: gvfs 1.32.2\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs\n"; +"POT-Creation-Date: 2018-03-05 13:03+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <l...@li.org>\n" @@ -73,6 +72,25 @@ msgid "Operation not supported" msgstr "" +#: client/gdaemonfileenumerator.c:553 client/gdaemonfileenumerator.c:636 +#: client/gdaemonfileenumerator.c:687 client/gdaemonfileinputstream.c:649 +#: client/gdaemonfileinputstream.c:802 client/gdaemonfileinputstream.c:922 +#: client/gdaemonfileinputstream.c:1173 client/gdaemonfileinputstream.c:1418 +#: client/gdaemonfileoutputstream.c:553 client/gdaemonfileoutputstream.c:731 +#: client/gdaemonfileoutputstream.c:926 client/gdaemonfileoutputstream.c:1092 +#: client/gdaemonfileoutputstream.c:1274 client/gvfsdaemondbus.c:631 +#: daemon/gvfsbackendsftp.c:5248 daemon/gvfsbackendsmb.c:1095 +#: daemon/gvfsbackendtest.c:92 daemon/gvfsbackendtest.c:125 +#: daemon/gvfsbackendtest.c:188 daemon/gvfschannel.c:350 +#: daemon/gvfsftptask.c:224 monitor/gdu/ggdumount.c:1072 +#: monitor/proxy/gproxydrive.c:569 monitor/proxy/gproxydrive.c:657 +#: monitor/proxy/gproxydrive.c:807 monitor/proxy/gproxydrive.c:945 +#: monitor/proxy/gproxydrive.c:983 monitor/proxy/gproxydrive.c:1108 +#: monitor/proxy/gproxymount.c:502 monitor/proxy/gproxymount.c:587 +#: monitor/proxy/gproxyvolume.c:863 monitor/proxy/gproxyvolume.c:927 +msgid "Operation was cancelled" +msgstr "" + #: client/gdaemonfileinputstream.c:544 client/gdaemonfileinputstream.c:552 #: client/gdaemonfileinputstream.c:1686 client/gdaemonfileinputstream.c:1695 #: client/gdaemonfileoutputstream.c:495 client/gdaemonfileoutputstream.c:503 @@ -83,27 +101,10 @@ #: client/gdaemonfileinputstream.c:552 client/gdaemonfileinputstream.c:1695 #: client/gdaemonfileoutputstream.c:503 client/gdaemonfileoutputstream.c:1442 -#: daemon/gvfsbackendmtp.c:2408 daemon/gvfsbackendmtp.c:2804 +#: daemon/gvfsbackendmtp.c:2420 daemon/gvfsbackendmtp.c:2816 msgid "End of stream" msgstr "" -#: client/gdaemonfileinputstream.c:649 client/gdaemonfileinputstream.c:802 -#: client/gdaemonfileinputstream.c:922 client/gdaemonfileinputstream.c:1173 -#: client/gdaemonfileinputstream.c:1418 client/gdaemonfileoutputstream.c:553 -#: client/gdaemonfileoutputstream.c:731 client/gdaemonfileoutputstream.c:926 -#: client/gdaemonfileoutputstream.c:1092 client/gdaemonfileoutputstream.c:1274 -#: daemon/gvfsbackendsftp.c:5249 daemon/gvfsbackendsmb.c:1095 -#: daemon/gvfsbackendtest.c:92 daemon/gvfsbackendtest.c:125 -#: daemon/gvfsbackendtest.c:188 daemon/gvfschannel.c:350 -#: daemon/gvfsftptask.c:224 monitor/gdu/ggdumount.c:1072 -#: monitor/proxy/gproxydrive.c:569 monitor/proxy/gproxydrive.c:657 -#: monitor/proxy/gproxydrive.c:807 monitor/proxy/gproxydrive.c:945 -#: monitor/proxy/gproxydrive.c:983 monitor/proxy/gproxydrive.c:1108 -#: monitor/proxy/gproxymount.c:502 monitor/proxy/gproxymount.c:587 -#: monitor/proxy/gproxyvolume.c:863 monitor/proxy/gproxyvolume.c:927 -msgid "Operation was cancelled" -msgstr "" - #: client/gdaemonfileinputstream.c:1355 client/gdaemonfileoutputstream.c:1035 msgid "Seek not supported on stream" msgstr "" @@ -356,24 +357,24 @@ #: daemon/gvfsafpvolume.c:1569 daemon/gvfsafpvolume.c:2015 #: daemon/gvfsafpvolume.c:2143 daemon/gvfsafpvolume.c:2305 #: daemon/gvfsafpvolume.c:2525 daemon/gvfsbackendadmin.c:140 -#: daemon/gvfsbackendgoogle.c:208 daemon/gvfsbackendsftp.c:345 -#: daemon/gvfsbackendsftp.c:1117 daemon/gvfsbackendsftp.c:2149 +#: daemon/gvfsbackendgoogle.c:207 daemon/gvfsbackendsftp.c:345 +#: daemon/gvfsbackendsftp.c:1116 daemon/gvfsbackendsftp.c:2148 #: daemon/gvfsftptask.c:439 msgid "Permission denied" msgstr "" #: daemon/gvfsafpvolume.c:414 daemon/gvfsafpvolume.c:1735 #: daemon/gvfsafpvolume.c:2529 daemon/gvfsbackendafc.c:218 -#: daemon/gvfsbackendafc.c:1135 daemon/gvfsbackendafpbrowse.c:190 +#: daemon/gvfsbackendafc.c:1124 daemon/gvfsbackendafpbrowse.c:190 #: daemon/gvfsbackendafpbrowse.c:327 daemon/gvfsbackendafpbrowse.c:359 #: daemon/gvfsbackendarchive.c:737 daemon/gvfsbackendarchive.c:792 #: daemon/gvfsbackendarchive.c:844 daemon/gvfsbackendarchive.c:873 #: daemon/gvfsbackendcdda.c:906 daemon/gvfsbackendcomputer.c:639 #: daemon/gvfsbackenddnssd.c:425 daemon/gvfsbackendftp.c:778 #: daemon/gvfsbackendftp.c:1172 daemon/gvfsbackendmtp.c:1670 -#: daemon/gvfsbackendmtp.c:1686 daemon/gvfsbackendmtp.c:2128 -#: daemon/gvfsbackendmtp.c:2191 daemon/gvfsbackendmtp.c:2259 -#: daemon/gvfsbackendmtp.c:2629 daemon/gvfsbackendnetwork.c:697 +#: daemon/gvfsbackendmtp.c:1686 daemon/gvfsbackendmtp.c:2140 +#: daemon/gvfsbackendmtp.c:2203 daemon/gvfsbackendmtp.c:2271 +#: daemon/gvfsbackendmtp.c:2641 daemon/gvfsbackendnetwork.c:697 #: daemon/gvfsbackendsmbbrowse.c:1068 daemon/gvfsbackendsmbbrowse.c:1135 #: daemon/gvfsbackendsmbbrowse.c:1322 daemon/gvfsbackendsmbbrowse.c:1395 msgid "File doesn’t exist" @@ -384,9 +385,9 @@ #: daemon/gvfsbackendafp.c:1341 daemon/gvfsbackenddav.c:2333 #: daemon/gvfsbackenddav.c:2996 daemon/gvfsbackenddav.c:3276 #: daemon/gvfsbackendftp.c:815 daemon/gvfsbackendnfs.c:2487 -#: daemon/gvfsbackendsftp.c:2664 daemon/gvfsbackendsftp.c:3439 -#: daemon/gvfsbackendsftp.c:3767 daemon/gvfsbackendsftp.c:4836 -#: daemon/gvfsbackendsftp.c:5777 +#: daemon/gvfsbackendsftp.c:2663 daemon/gvfsbackendsftp.c:3438 +#: daemon/gvfsbackendsftp.c:3766 daemon/gvfsbackendsftp.c:4835 +#: daemon/gvfsbackendsftp.c:5776 msgid "File is directory" msgstr "" @@ -400,7 +401,7 @@ #: daemon/gvfsafpvolume.c:688 daemon/gvfsbackendafc.c:222 #: daemon/gvfsbackendburn.c:421 daemon/gvfsbackenddav.c:2723 -#: daemon/gvfsbackendsftp.c:2143 +#: daemon/gvfsbackendsftp.c:2142 msgid "Directory not empty" msgstr "" @@ -409,7 +410,7 @@ msgstr "" #: daemon/gvfsafpvolume.c:696 daemon/gvfsafpvolume.c:1245 -#: daemon/gvfsafpvolume.c:2147 daemon/gvfsbackendgoogle.c:214 +#: daemon/gvfsafpvolume.c:2147 daemon/gvfsbackendgoogle.c:213 msgid "Target object doesn’t exist" msgstr "" @@ -433,11 +434,11 @@ #: daemon/gvfsbackenddav.c:3043 daemon/gvfsbackenddav.c:3267 #: daemon/gvfsbackendftp.c:794 daemon/gvfsbackendftp.c:982 #: daemon/gvfsbackendftp.c:1492 daemon/gvfsbackendftp.c:1600 -#: daemon/gvfsbackendgoogle.c:1233 daemon/gvfsbackendgoogle.c:1565 -#: daemon/gvfsbackendgoogle.c:1838 daemon/gvfsbackendgoogle.c:2547 +#: daemon/gvfsbackendgoogle.c:1232 daemon/gvfsbackendgoogle.c:1564 +#: daemon/gvfsbackendgoogle.c:1837 daemon/gvfsbackendgoogle.c:2494 #: daemon/gvfsbackendmtp.c:1616 daemon/gvfsbackendmtp.c:1748 -#: daemon/gvfsbackendmtp.c:2062 daemon/gvfsbackendnfs.c:2497 -#: daemon/gvfsbackendsftp.c:4845 daemon/gvfsbackendsmb.c:2037 +#: daemon/gvfsbackendmtp.c:2074 daemon/gvfsbackendnfs.c:2497 +#: daemon/gvfsbackendsftp.c:4844 daemon/gvfsbackendsmb.c:2037 msgid "Target file already exists" msgstr "" @@ -511,7 +512,7 @@ #: daemon/gvfsafpvolume.c:2309 daemon/gvfsbackendmtp.c:1449 #: daemon/gvfsbackendmtp.c:1474 daemon/gvfsbackendmtp.c:1624 -#: daemon/gvfsbackendmtp.c:2007 daemon/gvfsbackendmtp.c:2554 +#: daemon/gvfsbackendmtp.c:2007 daemon/gvfsbackendmtp.c:2566 msgid "Directory doesn’t exist" msgstr "" @@ -531,13 +532,6 @@ msgid "File is not open for read access" msgstr "" -#: daemon/gvfsbackendadmin.c:845 daemon/gvfsbackendafc.c:475 -#: daemon/gvfsbackendarchive.c:638 daemon/gvfsbackendarchive.c:667 -#: daemon/gvfsbackenddav.c:1863 daemon/gvfsbackendgoogle.c:1668 -#: daemon/gvfsbackendhttp.c:256 daemon/gvfsbackendsmb.c:569 -msgid "Invalid mount spec" -msgstr "" - #: daemon/gvfsbackendafc.c:214 msgid "Internal Apple File Control error" msgstr "" @@ -607,36 +601,43 @@ msgid "Unhandled libimobiledevice error (%d)" msgstr "" -#: daemon/gvfsbackendafc.c:458 +#: daemon/gvfsbackendafc.c:456 msgid "Try again" msgstr "" -#: daemon/gvfsbackendafc.c:458 daemon/gvfsbackend.c:1001 +#: daemon/gvfsbackendafc.c:456 daemon/gvfsbackend.c:1001 #: monitor/gdu/ggdudrive.c:1024 monitor/gdu/ggdumount.c:923 #: monitor/udisks2/gvfsudisks2mount.c:787 msgid "Cancel" msgstr "" -#: daemon/gvfsbackendafc.c:481 daemon/gvfsbackendafc.c:511 +#: daemon/gvfsbackendafc.c:473 daemon/gvfsbackendarchive.c:638 +#: daemon/gvfsbackendarchive.c:667 daemon/gvfsbackenddav.c:1862 +#: daemon/gvfsbackendgoogle.c:1667 daemon/gvfsbackendhttp.c:256 +#: daemon/gvfsbackendsmb.c:569 +msgid "Invalid mount spec" +msgstr "" + +#: daemon/gvfsbackendafc.c:479 daemon/gvfsbackendafc.c:509 msgid "Invalid AFC location: must be in the form of afc://uuid:port-number" msgstr "" -#: daemon/gvfsbackendafc.c:497 +#: daemon/gvfsbackendafc.c:495 msgid "Apple Mobile Device" msgstr "" -#: daemon/gvfsbackendafc.c:502 +#: daemon/gvfsbackendafc.c:500 msgid "Apple Mobile Device, Jailbroken" msgstr "" -#: daemon/gvfsbackendafc.c:507 +#: daemon/gvfsbackendafc.c:505 msgid "Documents on Apple Mobile Device" msgstr "" #. translators: #. * This is the device name, with the service being browsed in brackets, eg.: #. * Alan Smithee's iPhone (jailbreak) -#: daemon/gvfsbackendafc.c:567 +#: daemon/gvfsbackendafc.c:564 #, c-format msgid "%s (jailbreak)" msgstr "" @@ -644,7 +645,7 @@ #. translators: #. * This is "Documents on foo" where foo is the device name, eg.: #. * Documents on Alan Smithee's iPhone -#: daemon/gvfsbackendafc.c:574 monitor/afc/afcvolume.c:176 +#: daemon/gvfsbackendafc.c:571 monitor/afc/afcvolume.c:176 #, c-format msgid "Documents on %s" msgstr "" @@ -652,7 +653,7 @@ #. 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:648 +#: daemon/gvfsbackendafc.c:645 #, c-format msgid "" "The device “%s” is locked. Enter the passcode on the device and click “Try " @@ -663,26 +664,26 @@ #. * %s is the device name. 'Try again' is the caption of the button #. * shown in the dialog which is defined above. 'Trust' is the caption #. * of the button shown in the device. -#: daemon/gvfsbackendafc.c:656 +#: daemon/gvfsbackendafc.c:653 #, c-format msgid "" "The device “%s” is not trusted yet. Select “Trust” on the device and click " "“Try again”." msgstr "" -#: daemon/gvfsbackendafc.c:1124 daemon/gvfsbackendarchive.c:745 -#: daemon/gvfsbackendcomputer.c:657 daemon/gvfsbackendgoogle.c:2247 -#: daemon/gvfsbackendgphoto2.c:1501 daemon/gvfsbackendmtp.c:2281 -#: daemon/gvfsbackendnfs.c:356 daemon/gvfsbackendrecent.c:126 +#: daemon/gvfsbackendafc.c:1113 daemon/gvfsbackendarchive.c:745 +#: daemon/gvfsbackendcomputer.c:657 daemon/gvfsbackendgoogle.c:2194 +#: daemon/gvfsbackendgphoto2.c:1501 daemon/gvfsbackendmtp.c:2293 +#: daemon/gvfsbackendnfs.c:356 daemon/gvfsbackendrecent.c:123 #: daemon/gvfsbackendsmb.c:659 daemon/gvfsbackendtrash.c:234 msgid "Can’t open directory" msgstr "" -#: daemon/gvfsbackendafc.c:1344 +#: daemon/gvfsbackendafc.c:1333 msgid "Backups are not yet supported." msgstr "" -#: daemon/gvfsbackendafc.c:1506 daemon/gvfsbackendsmb.c:712 +#: daemon/gvfsbackendafc.c:1495 daemon/gvfsbackendsmb.c:712 #: daemon/gvfsbackendsmb.c:1191 msgid "Unsupported seek type" msgstr "" @@ -691,23 +692,24 @@ #. * G_IO_ERROR_CANT_CREATE_BACKUP to proceed with the GIO #. * fallback copy. #. -#: daemon/gvfsbackendafc.c:2428 daemon/gvfsbackendafp.c:1781 +#: daemon/gvfsbackendafc.c:2417 daemon/gvfsbackendafp.c:1781 #: daemon/gvfsbackendftp.c:1192 daemon/gvfsbackendftp.c:1240 -#: daemon/gvfsbackendftp.c:1261 daemon/gvfsbackendgoogle.c:1139 -#: daemon/gvfsbackendgoogle.c:1207 daemon/gvfsbackendgoogle.c:1228 -#: daemon/gvfsbackendgoogle.c:1314 daemon/gvfsbackendgoogle.c:1382 -#: daemon/gvfsbackendgoogle.c:1540 daemon/gvfsbackendgoogle.c:1768 -#: daemon/gvfsbackendgoogle.c:2463 daemon/gvfsbackendgoogle.c:2518 -#: daemon/gvfsbackendgoogle.c:2542 daemon/gvfsbackendgoogle.c:2628 -#: daemon/gvfsbackendmtp.c:2248 daemon/gvfsbackendmtp.c:2443 -#: daemon/gvfsbackendmtp.c:2530 daemon/gvfsbackendmtp.c:2618 -#: daemon/gvfsbackendmtp.c:2686 daemon/gvfsbackendnfs.c:2379 -#: daemon/gvfsbackendsftp.c:2147 daemon/gvfsbackendsftp.c:5213 -#: daemon/gvfsbackendsmb.c:1683 daemon/gvfsftptask.c:431 +#: daemon/gvfsbackendftp.c:1261 daemon/gvfsbackendgoogle.c:1138 +#: daemon/gvfsbackendgoogle.c:1206 daemon/gvfsbackendgoogle.c:1227 +#: daemon/gvfsbackendgoogle.c:1313 daemon/gvfsbackendgoogle.c:1381 +#: daemon/gvfsbackendgoogle.c:1539 daemon/gvfsbackendgoogle.c:1767 +#: daemon/gvfsbackendgoogle.c:2410 daemon/gvfsbackendgoogle.c:2465 +#: daemon/gvfsbackendgoogle.c:2489 daemon/gvfsbackendgoogle.c:2575 +#: daemon/gvfsbackendmtp.c:2033 daemon/gvfsbackendmtp.c:2260 +#: daemon/gvfsbackendmtp.c:2455 daemon/gvfsbackendmtp.c:2542 +#: daemon/gvfsbackendmtp.c:2630 daemon/gvfsbackendmtp.c:2698 +#: daemon/gvfsbackendnfs.c:2379 daemon/gvfsbackendsftp.c:2146 +#: daemon/gvfsbackendsftp.c:5212 daemon/gvfsbackendsmb.c:1683 +#: daemon/gvfsftptask.c:431 msgid "Operation unsupported" msgstr "" -#: daemon/gvfsbackendafc.c:2595 daemon/gvfsbackenddav.c:2828 +#: daemon/gvfsbackendafc.c:2584 daemon/gvfsbackenddav.c:2828 #: daemon/gvfsbackendftp.c:1444 msgid "Backups not supported" msgstr "" @@ -733,7 +735,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:290 -#: daemon/gvfsbackendsftp.c:2004 daemon/gvfsbackendsmb.c:438 +#: daemon/gvfsbackendsftp.c:2003 daemon/gvfsbackendsmb.c:438 #: daemon/gvfsbackendsmb.c:1365 #, c-format msgid "%s on %s" @@ -747,7 +749,7 @@ #: daemon/gvfsbackendafpbrowse.c:498 daemon/gvfsbackendafp.c:2139 #: daemon/gvfsbackendarchive.c:627 daemon/gvfsbackendftp.c:706 -#: daemon/gvfsbackendnfs.c:197 daemon/gvfsbackendsftp.c:2056 +#: daemon/gvfsbackendnfs.c:197 daemon/gvfsbackendsftp.c:2055 msgid "No hostname specified" msgstr "" @@ -757,21 +759,21 @@ #: daemon/gvfsbackendafp.c:286 daemon/gvfsbackendburn.c:875 #: daemon/gvfsbackenddav.c:2991 daemon/gvfsbackendftp.c:1592 -#: daemon/gvfsbackendgoogle.c:1810 +#: daemon/gvfsbackendgoogle.c:1809 msgid "Can’t copy directory over directory" msgstr "" #: daemon/gvfsbackendafp.c:305 daemon/gvfsbackendburn.c:891 #: daemon/gvfsbackenddav.c:3020 daemon/gvfsbackendftp.c:1615 -#: daemon/gvfsbackendgoogle.c:1244 daemon/gvfsbackendgoogle.c:1829 -#: daemon/gvfsbackendgoogle.c:1849 daemon/gvfsbackendmtp.c:1731 -#: daemon/gvfsbackendmtp.c:1754 daemon/gvfsbackendmtp.c:2044 -#: daemon/gvfsbackendmtp.c:2068 +#: daemon/gvfsbackendgoogle.c:1243 daemon/gvfsbackendgoogle.c:1828 +#: daemon/gvfsbackendgoogle.c:1848 daemon/gvfsbackendmtp.c:1731 +#: daemon/gvfsbackendmtp.c:1754 daemon/gvfsbackendmtp.c:2056 +#: daemon/gvfsbackendmtp.c:2080 msgid "Can’t recursively copy directory" msgstr "" #: daemon/gvfsbackendafp.c:489 daemon/gvfsbackenddav.c:2868 -#: daemon/gvfsbackendnfs.c:2481 daemon/gvfsbackendsftp.c:4831 +#: daemon/gvfsbackendnfs.c:2481 daemon/gvfsbackendsftp.c:4830 #: daemon/gvfsbackendsmb.c:2026 msgid "Can’t move directory over directory" msgstr "" @@ -786,13 +788,13 @@ msgstr "" #: daemon/gvfsbackendafp.c:1348 daemon/gvfsbackenddav.c:2469 -#: daemon/gvfsbackendnfs.c:1184 daemon/gvfsbackendsftp.c:3782 +#: daemon/gvfsbackendnfs.c:1184 daemon/gvfsbackendsftp.c:3781 #: daemon/gvfsbackendsmb.c:1064 msgid "The file was externally modified" msgstr "" #: daemon/gvfsbackendafp.c:1765 daemon/gvfsbackendftp.c:1233 -#: daemon/gvfsbackendsftp.c:5223 +#: daemon/gvfsbackendsftp.c:5222 msgid "Invalid attribute type (uint32 expected)" msgstr "" @@ -815,10 +817,10 @@ #: daemon/gvfsbackendarchive.c:882 daemon/gvfsbackendburn.c:679 #: daemon/gvfsbackendcomputer.c:729 daemon/gvfsbackenddnssd.c:474 -#: daemon/gvfsbackendftp.c:354 daemon/gvfsbackendgoogle.c:679 -#: daemon/gvfsbackendgoogle.c:1213 daemon/gvfsbackendgoogle.c:1332 -#: daemon/gvfsbackendgoogle.c:1473 daemon/gvfsbackendnetwork.c:745 -#: daemon/gvfsbackendsftp.c:4321 daemon/gvfsftpdircache.c:157 +#: daemon/gvfsbackendftp.c:354 daemon/gvfsbackendgoogle.c:678 +#: daemon/gvfsbackendgoogle.c:1212 daemon/gvfsbackendgoogle.c:1331 +#: daemon/gvfsbackendgoogle.c:1472 daemon/gvfsbackendnetwork.c:745 +#: daemon/gvfsbackendsftp.c:4320 daemon/gvfsftpdircache.c:157 msgid "The file is not a directory" msgstr "" @@ -836,17 +838,17 @@ #: daemon/gvfsbackendburn.c:716 daemon/gvfsbackendburn.c:742 #: daemon/gvfsbackendburn.c:780 daemon/gvfsbackendburn.c:971 #: daemon/gvfsbackendburn.c:1007 daemon/gvfsbackendftp.c:835 -#: daemon/gvfsbackendgoogle.c:645 daemon/gvfsbackendgphoto2.c:934 +#: daemon/gvfsbackendgoogle.c:644 daemon/gvfsbackendgphoto2.c:934 #: daemon/gvfsbackendgphoto2.c:1822 daemon/gvfsbackendgphoto2.c:2541 -#: daemon/gvfsbackendrecent.c:110 daemon/gvfsbackendrecent.c:293 -#: daemon/gvfsbackendsftp.c:2151 daemon/gvfsbackendsftp.c:3316 -#: daemon/gvfsbackendsftp.c:3329 daemon/gvfsbackendsftp.c:3349 +#: daemon/gvfsbackendrecent.c:107 daemon/gvfsbackendrecent.c:288 +#: daemon/gvfsbackendsftp.c:2150 daemon/gvfsbackendsftp.c:3315 +#: daemon/gvfsbackendsftp.c:3328 daemon/gvfsbackendsftp.c:3348 #: daemon/gvfsbackendtrash.c:218 msgid "No such file or directory" msgstr "" #: daemon/gvfsbackendburn.c:455 daemon/gvfsbackendburn.c:903 -#: daemon/gvfsbackendgoogle.c:1818 +#: daemon/gvfsbackendgoogle.c:1817 msgid "Can’t copy file over directory" msgstr "" @@ -893,7 +895,7 @@ msgstr "" #: daemon/gvfsbackendburn.c:884 daemon/gvfsbackenddav.c:2906 -#: daemon/gvfsbackendsftp.c:2145 daemon/gvfsbackendsftp.c:5011 +#: daemon/gvfsbackendsftp.c:2144 daemon/gvfsbackendsftp.c:5010 msgid "Target file exists" msgstr "" @@ -903,9 +905,9 @@ #: daemon/gvfsbackendgphoto2.c:2501 daemon/gvfsbackendgphoto2.c:2594 #: daemon/gvfsbackendgphoto2.c:3203 daemon/gvfsbackendgphoto2.c:3213 #: daemon/gvfsbackendnfs.c:2429 daemon/gvfsbackendnfs.c:2555 -#: daemon/gvfsbackendsftp.c:5895 daemon/gvfsbackendsftp.c:5927 -#: daemon/gvfsbackendsftp.c:5953 daemon/gvfsbackendsftp.c:6424 -#: daemon/gvfsbackendsftp.c:6486 +#: daemon/gvfsbackendsftp.c:5894 daemon/gvfsbackendsftp.c:5926 +#: daemon/gvfsbackendsftp.c:5952 daemon/gvfsbackendsftp.c:6423 +#: daemon/gvfsbackendsftp.c:6485 msgid "Not supported" msgstr "" @@ -1063,24 +1065,24 @@ msgid "Unexpected reply from server" msgstr "" -#: daemon/gvfsbackenddav.c:1422 daemon/gvfsbackenddav.c:2131 +#: daemon/gvfsbackenddav.c:1421 daemon/gvfsbackenddav.c:2131 #: daemon/gvfsbackenddav.c:2223 daemon/gvfsbackenddav.c:2325 msgid "Response invalid" msgstr "" -#: daemon/gvfsbackenddav.c:1565 +#: daemon/gvfsbackenddav.c:1564 msgid "WebDAV share" msgstr "" #. translators: %s here is the hostname #. Translators: %s is the hostname -#: daemon/gvfsbackenddav.c:1567 daemon/gvfsbackendftp.c:529 -#: daemon/gvfsbackendsftp.c:1166 +#: daemon/gvfsbackenddav.c:1566 daemon/gvfsbackendftp.c:529 +#: daemon/gvfsbackendsftp.c:1165 #, c-format msgid "Enter password for %s" msgstr "" -#: daemon/gvfsbackenddav.c:1570 +#: daemon/gvfsbackenddav.c:1569 msgid "Please enter proxy password" msgstr "" @@ -1098,7 +1100,7 @@ msgstr "" #: daemon/gvfsbackenddav.c:2500 daemon/gvfsbackendftp.c:1085 -#: daemon/gvfsbackendgoogle.c:2622 daemon/gvfsbackendnfs.c:948 +#: daemon/gvfsbackendgoogle.c:2569 daemon/gvfsbackendnfs.c:948 #: daemon/gvfsbackendnfs.c:971 daemon/gvfsbackendnfs.c:997 #: daemon/gvfsbackendnfs.c:1397 daemon/gvfsbackendsmb.c:1100 #: daemon/gvfsbackendsmb.c:2054 @@ -1132,12 +1134,12 @@ msgstr "" #. Translators: the first %s is the username, the second the host name -#: daemon/gvfsbackendftp.c:526 daemon/gvfsbackendsftp.c:1159 +#: daemon/gvfsbackendftp.c:526 daemon/gvfsbackendsftp.c:1158 #, c-format msgid "Enter password for %s on %s" msgstr "" -#: daemon/gvfsbackendftp.c:556 daemon/gvfsbackendsftp.c:1183 +#: daemon/gvfsbackendftp.c:556 daemon/gvfsbackendsftp.c:1182 #: daemon/gvfsbackendsmbbrowse.c:963 daemon/gvfsbackendsmb.c:524 msgid "Password dialog cancelled" msgstr "" @@ -1146,49 +1148,49 @@ msgid "Insufficient permissions" msgstr "" -#: daemon/gvfsbackendgoogle.c:1717 daemon/gvfsbackendgoogle.c:2296 +#: daemon/gvfsbackendgoogle.c:1716 daemon/gvfsbackendgoogle.c:2243 #: daemon/gvfsbackendgphoto2.c:1542 msgid "Error getting data from file" msgstr "" -#: daemon/gvfsbackendgoogle.c:2254 daemon/gvfsbackendsftp.c:2324 -#: daemon/gvfsbackendsftp.c:2731 daemon/gvfsbackendsftp.c:2794 -#: daemon/gvfsbackendsftp.c:2805 daemon/gvfsbackendsftp.c:2863 -#: daemon/gvfsbackendsftp.c:2956 daemon/gvfsbackendsftp.c:3008 -#: daemon/gvfsbackendsftp.c:3063 daemon/gvfsbackendsftp.c:3142 -#: daemon/gvfsbackendsftp.c:3259 daemon/gvfsbackendsftp.c:3392 -#: daemon/gvfsbackendsftp.c:3476 daemon/gvfsbackendsftp.c:3552 -#: daemon/gvfsbackendsftp.c:3564 daemon/gvfsbackendsftp.c:3624 -#: daemon/gvfsbackendsftp.c:3666 daemon/gvfsbackendsftp.c:3854 -#: daemon/gvfsbackendsftp.c:3888 daemon/gvfsbackendsftp.c:3946 -#: daemon/gvfsbackendsftp.c:4008 daemon/gvfsbackendsftp.c:4079 -#: daemon/gvfsbackendsftp.c:4354 daemon/gvfsbackendsftp.c:4425 -#: daemon/gvfsbackendsftp.c:4560 daemon/gvfsbackendsftp.c:4670 -#: daemon/gvfsbackendsftp.c:4732 daemon/gvfsbackendsftp.c:4769 -#: daemon/gvfsbackendsftp.c:4797 daemon/gvfsbackendsftp.c:4911 -#: daemon/gvfsbackendsftp.c:4967 daemon/gvfsbackendsftp.c:5008 -#: daemon/gvfsbackendsftp.c:5044 daemon/gvfsbackendsftp.c:5080 -#: daemon/gvfsbackendsftp.c:5095 daemon/gvfsbackendsftp.c:5110 -#: daemon/gvfsbackendsftp.c:5194 daemon/gvfsbackendsftp.c:5380 -#: daemon/gvfsbackendsftp.c:5417 daemon/gvfsbackendsftp.c:5491 -#: daemon/gvfsbackendsftp.c:5577 daemon/gvfsbackendsftp.c:5661 -#: daemon/gvfsbackendsftp.c:5704 daemon/gvfsbackendsftp.c:5708 -#: daemon/gvfsbackendsftp.c:5825 daemon/gvfsbackendsftp.c:5829 -#: daemon/gvfsbackendsftp.c:6066 daemon/gvfsbackendsftp.c:6279 -#: daemon/gvfsbackendsftp.c:6296 daemon/gvfsbackendsftp.c:6430 -#: daemon/gvfsbackendsftp.c:6458 +#: daemon/gvfsbackendgoogle.c:2201 daemon/gvfsbackendsftp.c:2323 +#: daemon/gvfsbackendsftp.c:2730 daemon/gvfsbackendsftp.c:2793 +#: daemon/gvfsbackendsftp.c:2804 daemon/gvfsbackendsftp.c:2862 +#: daemon/gvfsbackendsftp.c:2955 daemon/gvfsbackendsftp.c:3007 +#: daemon/gvfsbackendsftp.c:3062 daemon/gvfsbackendsftp.c:3141 +#: daemon/gvfsbackendsftp.c:3258 daemon/gvfsbackendsftp.c:3391 +#: daemon/gvfsbackendsftp.c:3475 daemon/gvfsbackendsftp.c:3551 +#: daemon/gvfsbackendsftp.c:3563 daemon/gvfsbackendsftp.c:3623 +#: daemon/gvfsbackendsftp.c:3665 daemon/gvfsbackendsftp.c:3853 +#: daemon/gvfsbackendsftp.c:3887 daemon/gvfsbackendsftp.c:3945 +#: daemon/gvfsbackendsftp.c:4007 daemon/gvfsbackendsftp.c:4078 +#: daemon/gvfsbackendsftp.c:4353 daemon/gvfsbackendsftp.c:4424 +#: daemon/gvfsbackendsftp.c:4559 daemon/gvfsbackendsftp.c:4669 +#: daemon/gvfsbackendsftp.c:4731 daemon/gvfsbackendsftp.c:4768 +#: daemon/gvfsbackendsftp.c:4796 daemon/gvfsbackendsftp.c:4910 +#: daemon/gvfsbackendsftp.c:4966 daemon/gvfsbackendsftp.c:5007 +#: daemon/gvfsbackendsftp.c:5043 daemon/gvfsbackendsftp.c:5079 +#: daemon/gvfsbackendsftp.c:5094 daemon/gvfsbackendsftp.c:5109 +#: daemon/gvfsbackendsftp.c:5193 daemon/gvfsbackendsftp.c:5379 +#: daemon/gvfsbackendsftp.c:5416 daemon/gvfsbackendsftp.c:5490 +#: daemon/gvfsbackendsftp.c:5576 daemon/gvfsbackendsftp.c:5660 +#: daemon/gvfsbackendsftp.c:5703 daemon/gvfsbackendsftp.c:5707 +#: daemon/gvfsbackendsftp.c:5824 daemon/gvfsbackendsftp.c:5828 +#: daemon/gvfsbackendsftp.c:6065 daemon/gvfsbackendsftp.c:6278 +#: daemon/gvfsbackendsftp.c:6295 daemon/gvfsbackendsftp.c:6429 +#: daemon/gvfsbackendsftp.c:6457 msgid "Invalid reply received" msgstr "" -#: daemon/gvfsbackendgoogle.c:2649 daemon/gvfsbackendnfs.c:1159 +#: daemon/gvfsbackendgoogle.c:2596 daemon/gvfsbackendnfs.c:1159 msgid "Target file is a directory" msgstr "" -#: daemon/gvfsbackendgoogle.c:2657 daemon/gvfsbackendnfs.c:1169 +#: daemon/gvfsbackendgoogle.c:2604 daemon/gvfsbackendnfs.c:1169 msgid "Target file is not a regular file" msgstr "" -#: daemon/gvfsbackendgoogle.c:2847 daemon/gvfsbackendgphoto2.c:3003 +#: daemon/gvfsbackendgoogle.c:2794 daemon/gvfsbackendgphoto2.c:3003 msgid "Error writing file" msgstr "" @@ -1273,7 +1275,7 @@ msgid "Error getting file" msgstr "" -#: daemon/gvfsbackendgphoto2.c:1600 daemon/gvfsbackendmtp.c:2371 +#: daemon/gvfsbackendgphoto2.c:1600 daemon/gvfsbackendmtp.c:2383 #, c-format msgid "Malformed icon identifier “%s”" msgstr "" @@ -1283,7 +1285,7 @@ msgid "Error seeking in stream on camera %s" msgstr "" -#: daemon/gvfsbackendgphoto2.c:1816 daemon/gvfsbackendsftp.c:3319 +#: daemon/gvfsbackendgphoto2.c:1816 daemon/gvfsbackendsftp.c:3318 #: daemon/gvfsbackendsmbbrowse.c:1391 msgid "Not a directory" msgstr "" @@ -1429,26 +1431,26 @@ msgid "Cannot make directory in this location" msgstr "" -#: daemon/gvfsbackendmtp.c:1675 daemon/gvfsbackendmtp.c:2133 -#: daemon/gvfsbackendmtp.c:2196 daemon/gvfsbackendmtp.c:2264 -#: daemon/gvfsbackendmtp.c:2634 daemon/gvfsbackendmtp.c:2700 +#: daemon/gvfsbackendmtp.c:1675 daemon/gvfsbackendmtp.c:2145 +#: daemon/gvfsbackendmtp.c:2208 daemon/gvfsbackendmtp.c:2276 +#: daemon/gvfsbackendmtp.c:2646 daemon/gvfsbackendmtp.c:2712 #: daemon/gvfsbackendsmbbrowse.c:1131 msgid "Not a regular file" msgstr "" -#: daemon/gvfsbackendmtp.c:1721 daemon/gvfsbackendmtp.c:2034 +#: daemon/gvfsbackendmtp.c:1721 daemon/gvfsbackendmtp.c:2046 msgid "Target is a directory" msgstr "" -#: daemon/gvfsbackendmtp.c:1726 daemon/gvfsbackendmtp.c:2039 +#: daemon/gvfsbackendmtp.c:1726 daemon/gvfsbackendmtp.c:2051 msgid "Can’t merge directories" msgstr "" -#: daemon/gvfsbackendmtp.c:1984 daemon/gvfsbackendmtp.c:2546 +#: daemon/gvfsbackendmtp.c:1984 daemon/gvfsbackendmtp.c:2558 msgid "Cannot write to this location" msgstr "" -#: daemon/gvfsbackendmtp.c:2353 +#: daemon/gvfsbackendmtp.c:2365 #, c-format msgid "No thumbnail for entity “%s”" msgstr "" @@ -1482,8 +1484,8 @@ msgstr "" #: daemon/gvfsbackendnfs.c:1055 daemon/gvfsbackendnfs.c:1078 -#: daemon/gvfsbackendnfs.c:1126 daemon/gvfsbackendsftp.c:3702 -#: daemon/gvfsbackendsftp.c:5732 +#: daemon/gvfsbackendnfs.c:1126 daemon/gvfsbackendsftp.c:3701 +#: daemon/gvfsbackendsftp.c:5731 msgid "Unable to create temporary file" msgstr "" @@ -1491,13 +1493,13 @@ msgid "Invalid attribute type" msgstr "" -#: daemon/gvfsbackendrecent.c:270 +#: daemon/gvfsbackendrecent.c:267 msgid "The recent folder may not be deleted" msgstr "" #. Translators: this is the display name of the backend #. translators: This is the name of the backend -#: daemon/gvfsbackendrecent.c:689 daemon/gvfsbackendrecent.c:810 +#: daemon/gvfsbackendrecent.c:592 daemon/gvfsbackendrecent.c:707 msgid "Recent" msgstr "" @@ -1555,22 +1557,22 @@ msgstr "" #. Translators: the first %s is the username, the second the host name -#: daemon/gvfsbackendsftp.c:1156 +#: daemon/gvfsbackendsftp.c:1155 #, c-format msgid "Enter passphrase for secure key for %s on %s" msgstr "" #. Translators: %s is the hostname -#: daemon/gvfsbackendsftp.c:1163 +#: daemon/gvfsbackendsftp.c:1162 #, c-format msgid "Enter passphrase for secure key for %s" msgstr "" -#: daemon/gvfsbackendsftp.c:1255 +#: daemon/gvfsbackendsftp.c:1254 msgid "Can’t send password" msgstr "" -#: daemon/gvfsbackendsftp.c:1271 +#: daemon/gvfsbackendsftp.c:1270 #, c-format msgid "" "Can’t verify the identity of “%s”.\n" @@ -1580,7 +1582,7 @@ "absolutely sure it is safe to continue, contact the system administrator." msgstr "" -#: daemon/gvfsbackendsftp.c:1298 +#: daemon/gvfsbackendsftp.c:1297 #, c-format msgid "" "The host key for “%s” differs from the key for the IP address “%s”\n" @@ -1588,47 +1590,47 @@ "administrator." msgstr "" -#: daemon/gvfsbackendsftp.c:1389 +#: daemon/gvfsbackendsftp.c:1388 msgid "The connection is closed (the underlying SSH process exited)" msgstr "" -#: daemon/gvfsbackendsftp.c:1390 +#: daemon/gvfsbackendsftp.c:1389 msgid "Internal error: Unknown Error" msgstr "" -#: daemon/gvfsbackendsftp.c:1904 daemon/gvfsbackendsftp.c:1931 +#: daemon/gvfsbackendsftp.c:1903 daemon/gvfsbackendsftp.c:1930 msgid "Protocol error" msgstr "" -#: daemon/gvfsbackendsftp.c:2046 +#: daemon/gvfsbackendsftp.c:2045 msgid "Unable to find supported SSH command" msgstr "" -#: daemon/gvfsbackendsftp.c:2153 +#: daemon/gvfsbackendsftp.c:2152 msgid "Unknown reason" msgstr "" -#: daemon/gvfsbackendsftp.c:2588 daemon/gvfsbackendsmb.c:1372 +#: daemon/gvfsbackendsftp.c:2587 daemon/gvfsbackendsmb.c:1372 #: daemon/gvfsdaemonutils.c:140 msgid " (invalid encoding)" msgstr "" #. Translators: This is the name of the root of an SFTP share, like "/ on <hostname>" -#: daemon/gvfsbackendsftp.c:2600 daemon/gvfsftpdircache.c:431 +#: daemon/gvfsbackendsftp.c:2599 daemon/gvfsftpdircache.c:431 #, c-format msgid "/ on %s" msgstr "" -#: daemon/gvfsbackendsftp.c:2673 +#: daemon/gvfsbackendsftp.c:2672 msgid "Failure" msgstr "" -#: daemon/gvfsbackendsftp.c:3085 +#: daemon/gvfsbackendsftp.c:3084 #, c-format msgid "Error creating backup file: %s" msgstr "" -#: daemon/gvfsbackendsftp.c:3652 daemon/gvfsbackendsftp.c:3828 +#: daemon/gvfsbackendsftp.c:3651 daemon/gvfsbackendsftp.c:3827 msgid "backups not supported yet" msgstr "" @@ -1897,24 +1899,24 @@ msgid "Try “%s --help” for more information." msgstr "" -#: daemon/mount.c:711 +#: daemon/mount.c:709 #, c-format msgid "Automount failed: %s" msgstr "" -#: daemon/mount.c:755 daemon/mount.c:831 +#: daemon/mount.c:753 daemon/mount.c:814 msgid "The specified location is not mounted" msgstr "" -#: daemon/mount.c:760 +#: daemon/mount.c:758 msgid "The specified location is not supported" msgstr "" -#: daemon/mount.c:943 +#: daemon/mount.c:882 msgid "Location is already mounted" msgstr "" -#: daemon/mount.c:952 +#: daemon/mount.c:891 msgid "Location is not mountable" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/gvfs-1.34.2/test-driver new/gvfs-1.34.2.1/test-driver --- old/gvfs-1.34.2/test-driver 2018-02-06 09:59:08.000000000 +0100 +++ new/gvfs-1.34.2.1/test-driver 2018-03-05 13:20:31.000000000 +0100 @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # test-driver - basic testsuite driver script. scriptversion=2016-01-11.22; # UTC
