diff -Nru gvfs-1.28.1/aclocal.m4 gvfs-1.28.2/aclocal.m4 --- gvfs-1.28.1/aclocal.m4 2016-04-11 14:46:07.000000000 +0000 +++ gvfs-1.28.2/aclocal.m4 2016-05-09 14:08:43.000000000 +0000 @@ -20,492 +20,121 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. +# Copyright (C) 1995-2002 Free Software Foundation, Inc. +# Copyright (C) 2001-2003,2004 Red Hat, Inc. +# +# This file is free software, distributed under the terms of the GNU +# General Public License. As a special exception to the GNU General +# Public License, this file may be distributed as part of a program +# that contains a configuration script generated by Autoconf, under +# the same distribution terms as the rest of that program. +# +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995, 1996 +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# Major rework to remove unused code +# Owen Taylor , 12/11/2002 +# +# Added better handling of ALL_LINGUAS from GNU gettext version +# written by Bruno Haible, Owen Taylor 5/30/3002 +# +# Modified to require ngettext +# Matthias Clasen 08/06/2004 +# +# We need this here as well, since someone might use autoconf-2.5x +# to configure GLib then an older version to configure a package +# using AM_GLIB_GNU_GETTEXT +AC_PREREQ(2.53) + dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. +dnl We go to great lengths to make sure that aclocal won't +dnl try to pull in the installed version of these macros +dnl when running aclocal in the glib directory. dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -dnl with the API version to also check the API compatibility. Example: -dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -dnl this features allows to prevent build against newer versions of libgcrypt -dnl with a changed API. +m4_copy([AC_DEFUN],[glib_DEFUN]) +m4_copy([AC_REQUIRE],[glib_REQUIRE]) +dnl +dnl At the end, if we're not within glib, we'll define the public +dnl definitions in terms of our private definitions. dnl -AC_DEFUN([AM_PATH_LIBGCRYPT], -[ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi - - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) - tmp=ifelse([$1], ,1:1.2.0,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi +# GLIB_LC_MESSAGES +#-------------------- +glib_DEFUN([GLIB_LC_MESSAGES], + [AC_CHECK_HEADERS([locale.h]) + if test $ac_cv_header_locale_h = yes; then + AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, + [AC_TRY_LINK([#include ], [return LC_MESSAGES], + am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) + if test $am_cv_val_LC_MESSAGES = yes; then + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your file defines LC_MESSAGES.]) fi - fi - if test $ok = yes; then - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) - else - AC_MSG_RESULT(no) - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBGCRYPT API version]) - if test "$req_libgcrypt_api" -eq "$tmp" ; then - AC_MSG_RESULT([okay]) - else - ok=no - AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - ifelse([$2], , :, [$2]) - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - AC_MSG_WARN([[ -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***]]) + fi]) + +# GLIB_PATH_PROG_WITH_TEST +#---------------------------- +dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, +dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) +glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], +[# Extract the first word of "$2", so it can be a program name with args. +set dummy $2; ac_word=[$]2 +AC_MSG_CHECKING([for $ac_word]) +AC_CACHE_VAL(ac_cv_path_$1, +[case "[$]$1" in + /*) + ac_cv_path_$1="[$]$1" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in ifelse([$5], , $PATH, [$5]); do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if [$3]; then + ac_cv_path_$1="$ac_dir/$ac_word" + break fi fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LIBGCRYPT_CFLAGS) - AC_SUBST(LIBGCRYPT_LIBS) + done + IFS="$ac_save_ifs" +dnl If no 4th arg is given, leave the cache variable unset, +dnl so AC_PATH_PROGS will keep looking. +ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" +])dnl + ;; +esac])dnl +$1="$ac_cv_path_$1" +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then + AC_MSG_RESULT([$]$1) +else + AC_MSG_RESULT(no) +fi +AC_SUBST($1)dnl ]) -# nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, -dnl Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. -dnl -dnl This file can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2003. +# GLIB_WITH_NLS +#----------------- +glib_DEFUN([GLIB_WITH_NLS], + dnl NLS is obligatory + [USE_NLS=yes + AC_SUBST(USE_NLS) -AC_PREREQ([2.50]) + gt_cv_have_gettext=no -AC_DEFUN([AM_NLS], -[ - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE([nls], - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT([$USE_NLS]) - AC_SUBST([USE_NLS]) -]) + CATOBJEXT=NONE + XGETTEXT=: + INTLLIBS= -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 1 (pkg-config-0.24) -# -# Copyright © 2004 Scott James Remnant . -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# PKG_PROG_PKG_CONFIG([MIN-VERSION]) -# ---------------------------------- -AC_DEFUN([PKG_PROG_PKG_CONFIG], -[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) -m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) -m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) -AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) -AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) -AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) - -if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then - AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) -fi -if test -n "$PKG_CONFIG"; then - _pkg_min_version=m4_default([$1], [0.9.0]) - AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) - if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - PKG_CONFIG="" - fi -fi[]dnl -])# PKG_PROG_PKG_CONFIG - -# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# -# Check to see whether a particular set of modules exists. Similar -# to PKG_CHECK_MODULES(), but does not set variables or print errors. -# -# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place -# it's called might be skipped (such as if it is within an "if", you -# have to call PKG_CHECK_EXISTS manually -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_EXISTS], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -if test -n "$PKG_CONFIG" && \ - AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then - m4_default([$2], [:]) -m4_ifvaln([$3], [else - $3])dnl -fi]) - -# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) -# --------------------------------------------- -m4_define([_PKG_CONFIG], -[if test -n "$$1"; then - pkg_cv_[]$1="$$1" - elif test -n "$PKG_CONFIG"; then - PKG_CHECK_EXISTS([$3], - [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes ], - [pkg_failed=yes]) - else - pkg_failed=untried -fi[]dnl -])# _PKG_CONFIG - -# _PKG_SHORT_ERRORS_SUPPORTED -# ----------------------------- -AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi[]dnl -])# _PKG_SHORT_ERRORS_SUPPORTED - - -# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], -# [ACTION-IF-NOT-FOUND]) -# -# -# Note that if there is a possibility the first call to -# PKG_CHECK_MODULES might not happen, you should be sure to include an -# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac -# -# -# -------------------------------------------------------------- -AC_DEFUN([PKG_CHECK_MODULES], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl -AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl - -pkg_failed=no -AC_MSG_CHECKING([for $1]) - -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) - -m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS -and $1[]_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details.]) - -if test $pkg_failed = yes; then - AC_MSG_RESULT([no]) - _PKG_SHORT_ERRORS_SUPPORTED - if test $_pkg_short_errors_supported = yes; then - $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD - - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: - -$$1_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -_PKG_TEXT])[]dnl - ]) -elif test $pkg_failed = untried; then - AC_MSG_RESULT([no]) - m4_default([$4], [AC_MSG_FAILURE( -[The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -_PKG_TEXT - -To get pkg-config, see .])[]dnl - ]) -else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES - - -# PKG_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable pkgconfigdir as the location where a module -# should install pkg-config .pc files. By default the directory is -# $libdir/pkgconfig, but the default can be changed by passing -# DIRECTORY. The user can override through the --with-pkgconfigdir -# parameter. -AC_DEFUN([PKG_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([pkgconfigdir], - [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, - [with_pkgconfigdir=]pkg_default) -AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_INSTALLDIR - - -# PKG_NOARCH_INSTALLDIR(DIRECTORY) -# ------------------------- -# Substitutes the variable noarch_pkgconfigdir as the location where a -# module should install arch-independent pkg-config .pc files. By -# default the directory is $datadir/pkgconfig, but the default can be -# changed by passing DIRECTORY. The user can override through the -# --with-noarch-pkgconfigdir parameter. -AC_DEFUN([PKG_NOARCH_INSTALLDIR], -[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) -m4_pushdef([pkg_description], - [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) -AC_ARG_WITH([noarch-pkgconfigdir], - [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, - [with_noarch_pkgconfigdir=]pkg_default) -AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) -m4_popdef([pkg_default]) -m4_popdef([pkg_description]) -]) dnl PKG_NOARCH_INSTALLDIR - - -# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, -# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) -# ------------------------------------------- -# Retrieves the value of the pkg-config variable for the given module. -AC_DEFUN([PKG_CHECK_VAR], -[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl -AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl - -_PKG_CONFIG([$1], [variable="][$3]["], [$2]) -AS_VAR_COPY([$1], [pkg_cv_][$1]) - -AS_VAR_IF([$1], [""], [$5], [$4])dnl -])# PKG_CHECK_VAR - -# Copyright (C) 1995-2002 Free Software Foundation, Inc. -# Copyright (C) 2001-2003,2004 Red Hat, Inc. -# -# This file is free software, distributed under the terms of the GNU -# General Public License. As a special exception to the GNU General -# Public License, this file may be distributed as part of a program -# that contains a configuration script generated by Autoconf, under -# the same distribution terms as the rest of that program. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# -# Macro to add for using GNU gettext. -# Ulrich Drepper , 1995, 1996 -# -# Modified to never use included libintl. -# Owen Taylor , 12/15/1998 -# -# Major rework to remove unused code -# Owen Taylor , 12/11/2002 -# -# Added better handling of ALL_LINGUAS from GNU gettext version -# written by Bruno Haible, Owen Taylor 5/30/3002 -# -# Modified to require ngettext -# Matthias Clasen 08/06/2004 -# -# We need this here as well, since someone might use autoconf-2.5x -# to configure GLib then an older version to configure a package -# using AM_GLIB_GNU_GETTEXT -AC_PREREQ(2.53) - -dnl -dnl We go to great lengths to make sure that aclocal won't -dnl try to pull in the installed version of these macros -dnl when running aclocal in the glib directory. -dnl -m4_copy([AC_DEFUN],[glib_DEFUN]) -m4_copy([AC_REQUIRE],[glib_REQUIRE]) -dnl -dnl At the end, if we're not within glib, we'll define the public -dnl definitions in terms of our private definitions. -dnl - -# GLIB_LC_MESSAGES -#-------------------- -glib_DEFUN([GLIB_LC_MESSAGES], - [AC_CHECK_HEADERS([locale.h]) - if test $ac_cv_header_locale_h = yes; then - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, - [AC_TRY_LINK([#include ], [return LC_MESSAGES], - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) - if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES, 1, - [Define if your file defines LC_MESSAGES.]) - fi - fi]) - -# GLIB_PATH_PROG_WITH_TEST -#---------------------------- -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], -[# Extract the first word of "$2", so it can be a program name with args. -set dummy $2; ac_word=[$]2 -AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, -[case "[$]$1" in - /*) - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in ifelse([$5], , $PATH, [$5]); do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if [$3]; then - ac_cv_path_$1="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" -dnl If no 4th arg is given, leave the cache variable unset, -dnl so AC_PATH_PROGS will keep looking. -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" -])dnl - ;; -esac])dnl -$1="$ac_cv_path_$1" -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) -else - AC_MSG_RESULT(no) -fi -AC_SUBST($1)dnl -]) - -# GLIB_WITH_NLS -#----------------- -glib_DEFUN([GLIB_WITH_NLS], - dnl NLS is obligatory - [USE_NLS=yes - AC_SUBST(USE_NLS) - - gt_cv_have_gettext=no - - CATOBJEXT=NONE - XGETTEXT=: - INTLLIBS= - - AC_CHECK_HEADER(libintl.h, - [gt_cv_func_dgettext_libintl="no" - libintl_extra_libs="" + AC_CHECK_HEADER(libintl.h, + [gt_cv_func_dgettext_libintl="no" + libintl_extra_libs="" # # First check in libc @@ -667,250 +296,682 @@ fi fi - # We need to process the po/ directory. - POSUB=po + # We need to process the po/ directory. + POSUB=po + + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.ac. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done + + dnl Make all variables we use known to autoconf. + AC_SUBST(CATALOGS) + AC_SUBST(CATOBJEXT) + AC_SUBST(DATADIRNAME) + AC_SUBST(GMOFILES) + AC_SUBST(INSTOBJEXT) + AC_SUBST(INTLLIBS) + AC_SUBST(PO_IN_DATADIR_TRUE) + AC_SUBST(PO_IN_DATADIR_FALSE) + AC_SUBST(POFILES) + AC_SUBST(POSUB) + ]) + +# AM_GLIB_GNU_GETTEXT +# ------------------- +# Do checks necessary for use of gettext. If a suitable implementation +# of gettext is found in either in libintl or in the C library, +# it will set INTLLIBS to the libraries needed for use of gettext +# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable +# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() +# on various variables needed by the Makefile.in.in installed by +# glib-gettextize. +dnl +AU_DEFUN([GLIB_GNU_GETTEXT], + [AC_REQUIRE([AC_PROG_CC])dnl + + GLIB_LC_MESSAGES + GLIB_WITH_NLS + + if test "$gt_cv_have_gettext" = "yes"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + NEW_LINGUAS="$NEW_LINGUAS $presentlang" + fi + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi + + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES + ], + [[$0: This macro is deprecated. You should use upstream gettext instead.]]) + +# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) +# ------------------------------- +# Define VARIABLE to the location where catalog files will +# be installed by po/Makefile. +glib_DEFUN([GLIB_DEFINE_LOCALEDIR], +[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl +glib_save_prefix="$prefix" +glib_save_exec_prefix="$exec_prefix" +glib_save_datarootdir="$datarootdir" +test "x$prefix" = xNONE && prefix=$ac_default_prefix +test "x$exec_prefix" = xNONE && exec_prefix=$prefix +datarootdir=`eval echo "${datarootdir}"` +if test "x$CATOBJEXT" = "x.mo" ; then + localedir=`eval echo "${libdir}/locale"` +else + localedir=`eval echo "${datadir}/locale"` +fi +prefix="$glib_save_prefix" +exec_prefix="$glib_save_exec_prefix" +datarootdir="$glib_save_datarootdir" +AC_DEFINE_UNQUOTED($1, "$localedir", + [Define the location where the catalogs will be installed]) +]) + +dnl +dnl Now the definitions that aclocal will find +dnl +ifdef(glib_configure_ac,[],[ +AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) +AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) +])dnl + +# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) +# +# Create a temporary file with TEST-FILE as its contents and pass the +# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with +# 0 and perform ACTION-IF-FAIL for any other exit status. +AC_DEFUN([GLIB_RUN_PROG], +[cat >conftest.foo <<_ACEOF +$2 +_ACEOF +if AC_RUN_LOG([$1 conftest.foo]); then + m4_ifval([$3], [$3], [:]) +m4_ifvaln([$4], [else $4])dnl +echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD +sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +fi]) + + +dnl GLIB_GSETTINGS +dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether +dnl the schema should be compiled +dnl + +AC_DEFUN([GLIB_GSETTINGS], +[ + m4_pattern_allow([AM_V_GEN]) + AC_ARG_ENABLE(schemas-compile, + AS_HELP_STRING([--disable-schemas-compile], + [Disable regeneration of gschemas.compiled on install]), + [case ${enableval} in + yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; + no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; + esac]) + AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) + PKG_PROG_PKG_CONFIG([0.16]) + AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi + AC_SUBST(GLIB_COMPILE_SCHEMAS) + if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then + ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) + else + ifelse([$1],,[:],[$1]) + fi + + GSETTINGS_RULES=' +.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas + +mostlyclean-am: clean-gsettings-schemas + +gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) + +%.gschema.valid: %.gschema.xml $(gsettings__enum_file) + $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + +all-am: $(gsettings_SCHEMAS:.xml=.valid) +uninstall-am: uninstall-gsettings-schemas +install-data-am: install-gsettings-schemas + +.SECONDARY: $(gsettings_SCHEMAS) + +install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) + @$(NORMAL_INSTALL) + if test -n "$^"; then \ + test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ + $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ + fi + +uninstall-gsettings-schemas: + @$(NORMAL_UNINSTALL) + @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ + test -n "$$files" || exit 0; \ + echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files + test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) +clean-gsettings-schemas: + rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.ac. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done +ifdef gsettings_ENUM_NAMESPACE +$(gsettings__enum_file): $(gsettings_ENUM_FILES) + $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ +endif +' + _GSETTINGS_SUBST(GSETTINGS_RULES) +]) - dnl Make all variables we use known to autoconf. - AC_SUBST(CATALOGS) - AC_SUBST(CATOBJEXT) - AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) - AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLLIBS) - AC_SUBST(PO_IN_DATADIR_TRUE) - AC_SUBST(PO_IN_DATADIR_FALSE) - AC_SUBST(POFILES) - AC_SUBST(POSUB) - ]) +dnl _GSETTINGS_SUBST(VARIABLE) +dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +AC_DEFUN([_GSETTINGS_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) -# AM_GLIB_GNU_GETTEXT -# ------------------- -# Do checks necessary for use of gettext. If a suitable implementation -# of gettext is found in either in libintl or in the C library, -# it will set INTLLIBS to the libraries needed for use of gettext -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() -# on various variables needed by the Makefile.in.in installed by -# glib-gettextize. +dnl Autoconf macros for libgcrypt +dnl Copyright (C) 2002, 2004, 2011 Free Software Foundation, Inc. dnl -AU_DEFUN([GLIB_GNU_GETTEXT], - [AC_REQUIRE([AC_PROG_CC])dnl - - GLIB_LC_MESSAGES - GLIB_WITH_NLS +dnl This file is free software; as a special exception the author gives +dnl unlimited permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl +dnl This file is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - if test "$gt_cv_have_gettext" = "yes"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - NEW_LINGUAS="$NEW_LINGUAS $presentlang" - fi - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done +dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, +dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) +dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. +dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed +dnl with the API version to also check the API compatibility. Example: +dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed +dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using +dnl this features allows to prevent build against newer versions of libgcrypt +dnl with a changed API. +dnl +AC_DEFUN([AM_PATH_LIBGCRYPT], +[ AC_REQUIRE([AC_CANONICAL_HOST]) + AC_ARG_WITH(libgcrypt-prefix, + AC_HELP_STRING([--with-libgcrypt-prefix=PFX], + [prefix where LIBGCRYPT is installed (optional)]), + libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") + if test x$libgcrypt_config_prefix != x ; then + if test x${LIBGCRYPT_CONFIG+set} != xset ; then + LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config fi - fi + fi - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) + AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) + tmp=ifelse([$1], ,1:1.2.0,$1) + if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then + req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` + min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` + else + req_libgcrypt_api=0 + min_libgcrypt_version="$tmp" + fi - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" + AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) + ok=no + if test "$LIBGCRYPT_CONFIG" != "no" ; then + req_major=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` + req_minor=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` + req_micro=`echo $min_libgcrypt_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` + libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` + major=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` + minor=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` + micro=`echo $libgcrypt_config_version | \ + sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` + if test "$major" -gt "$req_major"; then + ok=yes + else + if test "$major" -eq "$req_major"; then + if test "$minor" -gt "$req_minor"; then + ok=yes + else + if test "$minor" -eq "$req_minor"; then + if test "$micro" -ge "$req_micro"; then + ok=yes + fi + fi + fi + fi + fi + fi + if test $ok = yes; then + AC_MSG_RESULT([yes ($libgcrypt_config_version)]) + else + AC_MSG_RESULT(no) + fi + if test $ok = yes; then + # If we have a recent libgcrypt, we should also check that the + # API is compatible + if test "$req_libgcrypt_api" -gt 0 ; then + tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` + if test "$tmp" -gt 0 ; then + AC_MSG_CHECKING([LIBGCRYPT API version]) + if test "$req_libgcrypt_api" -eq "$tmp" ; then + AC_MSG_RESULT([okay]) + else + ok=no + AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) + fi + fi fi - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES - ], - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) + fi + if test $ok = yes; then + LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` + LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` + ifelse([$2], , :, [$2]) + libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` + if test x"$libgcrypt_config_host" != xnone ; then + if test x"$libgcrypt_config_host" != x"$host" ; then + AC_MSG_WARN([[ +*** +*** The config script $LIBGCRYPT_CONFIG was +*** built for $libgcrypt_config_host and thus may not match the +*** used host $host. +*** You may want to use the configure option --with-libgcrypt-prefix +*** to specify a matching config script. +***]]) + fi + fi + else + LIBGCRYPT_CFLAGS="" + LIBGCRYPT_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(LIBGCRYPT_CFLAGS) + AC_SUBST(LIBGCRYPT_LIBS) +]) + +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, +dnl Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package is covered by the GNU General Public License. +dnl They are *not* in the public domain. -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) -# ------------------------------- -# Define VARIABLE to the location where catalog files will -# be installed by po/Makefile. -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl -glib_save_prefix="$prefix" -glib_save_exec_prefix="$exec_prefix" -glib_save_datarootdir="$datarootdir" -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix=$prefix -datarootdir=`eval echo "${datarootdir}"` -if test "x$CATOBJEXT" = "x.mo" ; then - localedir=`eval echo "${libdir}/locale"` -else - localedir=`eval echo "${datadir}/locale"` -fi -prefix="$glib_save_prefix" -exec_prefix="$glib_save_exec_prefix" -datarootdir="$glib_save_datarootdir" -AC_DEFINE_UNQUOTED($1, "$localedir", - [Define the location where the catalogs will be installed]) +dnl Authors: +dnl Ulrich Drepper , 1995-2000. +dnl Bruno Haible , 2000-2003. + +AC_PREREQ([2.50]) + +AC_DEFUN([AM_NLS], +[ + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE([nls], + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29) dnl -dnl Now the definitions that aclocal will find +dnl Copyright © 2004 Scott James Remnant . +dnl Copyright © 2012-2015 Dan Nicholson dnl -ifdef(glib_configure_ac,[],[ -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) -])dnl +dnl This program is free software; you can redistribute it and/or modify +dnl it under the terms of the GNU General Public License as published by +dnl the Free Software Foundation; either version 2 of the License, or +dnl (at your option) any later version. +dnl +dnl This program is distributed in the hope that it will be useful, but +dnl WITHOUT ANY WARRANTY; without even the implied warranty of +dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +dnl General Public License for more details. +dnl +dnl You should have received a copy of the GNU General Public License +dnl along with this program; if not, write to the Free Software +dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +dnl 02111-1307, USA. +dnl +dnl As a special exception to the GNU General Public License, if you +dnl distribute this file as part of a program that contains a +dnl configuration script generated by Autoconf, you may include it under +dnl the same distribution terms that you use for the rest of that +dnl program. + +dnl PKG_PREREQ(MIN-VERSION) +dnl ----------------------- +dnl Since: 0.29 +dnl +dnl Verify that the version of the pkg-config macros are at least +dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's +dnl installed version of pkg-config, this checks the developer's version +dnl of pkg.m4 when generating configure. +dnl +dnl To ensure that this macro is defined, also add: +dnl m4_ifndef([PKG_PREREQ], +dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])]) +dnl +dnl See the "Since" comment for each macro you use to see what version +dnl of the macros you require. +m4_defun([PKG_PREREQ], +[m4_define([PKG_MACROS_VERSION], [0.29]) +m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1, + [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])]) +])dnl PKG_PREREQ + +dnl PKG_PROG_PKG_CONFIG([MIN-VERSION]) +dnl ---------------------------------- +dnl Since: 0.16 +dnl +dnl Search for the pkg-config tool and set the PKG_CONFIG variable to +dnl first found in the path. Checks that the version of pkg-config found +dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is +dnl used since that's the first version where most current features of +dnl pkg-config existed. +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) -# -# Create a temporary file with TEST-FILE as its contents and pass the -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with -# 0 and perform ACTION-IF-FAIL for any other exit status. -AC_DEFUN([GLIB_RUN_PROG], -[cat >conftest.foo <<_ACEOF -$2 -_ACEOF -if AC_RUN_LOG([$1 conftest.foo]); then - m4_ifval([$3], [$3], [:]) -m4_ifvaln([$4], [else $4])dnl -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])dnl PKG_PROG_PKG_CONFIG + +dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------------------------------- +dnl Since: 0.18 +dnl +dnl Check to see whether a particular set of modules exists. Similar to +dnl PKG_CHECK_MODULES(), but does not set variables or print errors. +dnl +dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +dnl only at the first occurence in configure.ac, so if the first place +dnl it's called might be skipped (such as if it is within an "if", you +dnl have to call PKG_CHECK_EXISTS manually +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl fi]) +dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +dnl --------------------------------------------- +dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting +dnl pkg_failed based on the result. +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])dnl _PKG_CONFIG + +dnl _PKG_SHORT_ERRORS_SUPPORTED +dnl --------------------------- +dnl Internal check to see if pkg-config supports short errors. +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])dnl _PKG_SHORT_ERRORS_SUPPORTED + -dnl GLIB_GSETTINGS -dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether -dnl the schema should be compiled +dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl -------------------------------------------------------------- +dnl Since: 0.4.0 dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES might not happen, you should be sure to include an +dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl -AC_DEFUN([GLIB_GSETTINGS], -[ - m4_pattern_allow([AM_V_GEN]) - AC_ARG_ENABLE(schemas-compile, - AS_HELP_STRING([--disable-schemas-compile], - [Disable regeneration of gschemas.compiled on install]), - [case ${enableval} in - yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE="" ;; - no) GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;; - esac]) - AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) - PKG_PROG_PKG_CONFIG([0.16]) - AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - if test x$cross_compiling != xyes; then - GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` - else - AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) - fi - AC_SUBST(GLIB_COMPILE_SCHEMAS) - if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then - ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) - else - ifelse([$1],,[:],[$1]) - fi +pkg_failed=no +AC_MSG_CHECKING([for $1]) - GSETTINGS_RULES=' -.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) -mostlyclean-am: clean-gsettings-schemas +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) -gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE)) +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD -%.gschema.valid: %.gschema.xml $(gsettings__enum_file) - $(AM_V_GEN) $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$< && mkdir -p [$](@D) && touch [$]@ + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: -all-am: $(gsettings_SCHEMAS:.xml=.valid) -uninstall-am: uninstall-gsettings-schemas -install-data-am: install-gsettings-schemas +$$1_PKG_ERRORS -.SECONDARY: $(gsettings_SCHEMAS) +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. -install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file) - @$(NORMAL_INSTALL) - if test -n "$^"; then \ - test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \ - $(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \ - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \ - fi +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. -uninstall-gsettings-schemas: - @$(NORMAL_UNINSTALL) - @list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files - test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) +_PKG_TEXT -clean-gsettings-schemas: - rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file) +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])dnl PKG_CHECK_MODULES -ifdef gsettings_ENUM_NAMESPACE -$(gsettings__enum_file): $(gsettings_ENUM_FILES) - $(AM_V_GEN) glib-mkenums --comments '\'''\'' --fhead "" --vhead " <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod " " --vtail " " --ftail "" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@ -endif -' - _GSETTINGS_SUBST(GSETTINGS_RULES) -]) -dnl _GSETTINGS_SUBST(VARIABLE) -dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -AC_DEFUN([_GSETTINGS_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +dnl [ACTION-IF-NOT-FOUND]) +dnl --------------------------------------------------------------------- +dnl Since: 0.29 +dnl +dnl Checks for existence of MODULES and gathers its build flags with +dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags +dnl and VARIABLE-PREFIX_LIBS from --libs. +dnl +dnl Note that if there is a possibility the first call to +dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to +dnl include an explicit call to PKG_PROG_PKG_CONFIG in your +dnl configure.ac. +AC_DEFUN([PKG_CHECK_MODULES_STATIC], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +_save_PKG_CONFIG=$PKG_CONFIG +PKG_CONFIG="$PKG_CONFIG --static" +PKG_CHECK_MODULES($@) +PKG_CONFIG=$_save_PKG_CONFIG[]dnl +])dnl PKG_CHECK_MODULES_STATIC + + +dnl PKG_INSTALLDIR([DIRECTORY]) +dnl ------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable pkgconfigdir as the location where a module +dnl should install pkg-config .pc files. By default the directory is +dnl $libdir/pkgconfig, but the default can be changed by passing +dnl DIRECTORY. The user can override through the --with-pkgconfigdir +dnl parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_INSTALLDIR + + +dnl PKG_NOARCH_INSTALLDIR([DIRECTORY]) +dnl -------------------------------- +dnl Since: 0.27 +dnl +dnl Substitutes the variable noarch_pkgconfigdir as the location where a +dnl module should install arch-independent pkg-config .pc files. By +dnl default the directory is $datadir/pkgconfig, but the default can be +dnl changed by passing DIRECTORY. The user can override through the +dnl --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +])dnl PKG_NOARCH_INSTALLDIR + + +dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +dnl ------------------------------------------- +dnl Since: 0.28 +dnl +dnl Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])dnl PKG_CHECK_VAR # Copyright (C) 2002-2014 Free Software Foundation, Inc. # diff -Nru gvfs-1.28.1/ChangeLog gvfs-1.28.2/ChangeLog --- gvfs-1.28.1/ChangeLog 2016-04-11 14:46:17.000000000 +0000 +++ gvfs-1.28.2/ChangeLog 2016-05-09 14:08:57.000000000 +0000 @@ -1,6 +1,67 @@ +commit 784885be4a55814924dc1359c9b02beaaa397c69 +Author: Ondrej Holy +Date: 2016-05-09 + + Update NEWS for 1.28.2 release + +M NEWS + +commit f259c9c02c8e059abeefe91f0c8d39f54d639b15 +Author: Tiago Santos +Date: 2016-04-28 + + Updated Portuguese translation + +M po/pt.po + +commit 874a51730e68b63544c748373237baba58f1b0a6 +Author: Ondrej Holy +Date: 2016-04-18 + + udisks2: Fix crash when mounting encrypted volume + + Code handling external unlocks during mount operation was added by the + commit beea21e recently. Unfortunately, it may cause crashes due to + accessing already freed memory, because + gvfs_udisks2_volume_monitor_update + waits for pending dbus messages using udisks_client_settle, thus + another + main context iteration may happen (i.e. mount operation may finish and + mount data may be freed) before accessing mount data pointer. The + mount + data pointer has to be obtained after + gvfs_udisks2_volume_monitor_update + call in order to fix this crashes. + + https://bugzilla.gnome.org/show_bug.cgi?id=765146 + +M monitor/udisks2/gvfsudisks2volume.c + +commit 4a156988465cb86ee40f0d4454f5c38f895b92f8 +Author: Ondrej Holy +Date: 2016-04-13 + + sftp: Fix hostname and ip name parsing + + The value returned from strchr is immediately incremented. So NULL + is incremented if char is not found, therefore consequent check is + always true and next strchr can cause a segfault. + + https://bugzilla.gnome.org/show_bug.cgi?id=545445 + +M daemon/gvfsbackendsftp.c + +commit 442ccb08616dcfac4e5554ba9c43b50668192f3a +Author: Ondrej Holy +Date: 2016-04-11 + + Post release version bump + +M configure.ac + commit 238dbbd64daa54e942758c240417db0cebfb9c65 Author: Ondrej Holy -Date: 2016-04-11 +Date: 2016-04-11 Update NEWS for 1.28.1 release diff -Nru gvfs-1.28.1/common/gvfsdbus.c gvfs-1.28.2/common/gvfsdbus.c --- gvfs-1.28.1/common/gvfsdbus.c 2016-04-11 14:46:17.000000000 +0000 +++ gvfs-1.28.2/common/gvfsdbus.c 2016-05-09 14:08:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/common/gvfsdbus.h gvfs-1.28.2/common/gvfsdbus.h --- gvfs-1.28.1/common/gvfsdbus.h 2016-04-11 14:46:17.000000000 +0000 +++ gvfs-1.28.2/common/gvfsdbus.h 2016-05-09 14:08:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/configure gvfs-1.28.2/configure --- gvfs-1.28.1/configure 2016-04-11 14:46:10.000000000 +0000 +++ gvfs-1.28.2/configure 2016-05-09 14:08:48.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gvfs 1.28.1. +# Generated by GNU Autoconf 2.69 for gvfs 1.28.2. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='gvfs' PACKAGE_TARNAME='gvfs' -PACKAGE_VERSION='1.28.1' -PACKAGE_STRING='gvfs 1.28.1' +PACKAGE_VERSION='1.28.2' +PACKAGE_STRING='gvfs 1.28.2' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs' PACKAGE_URL='' @@ -1625,7 +1625,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.28.1 to adapt to many kinds of systems. +\`configure' configures gvfs 1.28.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1695,7 +1695,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of gvfs 1.28.1:";; + short | recursive ) echo "Configuration of gvfs 1.28.2:";; esac cat <<\_ACEOF @@ -1956,7 +1956,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -gvfs configure 1.28.1 +gvfs configure 1.28.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2482,7 +2482,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.28.1, which was +It was created by gvfs $as_me 1.28.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3345,7 +3345,7 @@ # Define the identity of the package. PACKAGE='gvfs' - VERSION='1.28.1' + VERSION='1.28.2' cat >>confdefs.h <<_ACEOF @@ -21314,7 +21314,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.28.1, which was +This file was extended by gvfs $as_me 1.28.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21380,7 +21380,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.28.1 +gvfs config.status 1.28.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru gvfs-1.28.1/configure.ac gvfs-1.28.2/configure.ac --- gvfs-1.28.1/configure.ac 2016-03-31 14:27:10.000000000 +0000 +++ gvfs-1.28.2/configure.ac 2016-05-09 13:54:47.000000000 +0000 @@ -1,6 +1,6 @@ AC_PREREQ([2.64]) -AC_INIT([gvfs],[1.28.1],[http://bugzilla.gnome.org/enter_bug.cgi?product=gvfs]) +AC_INIT([gvfs],[1.28.2],[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 -Nru gvfs-1.28.1/daemon/gvfsbackendsftp.c gvfs-1.28.2/daemon/gvfsbackendsftp.c --- gvfs-1.28.1/daemon/gvfsbackendsftp.c 2016-03-31 11:48:40.000000000 +0000 +++ gvfs-1.28.2/daemon/gvfsbackendsftp.c 2016-05-09 13:54:47.000000000 +0000 @@ -854,9 +854,10 @@ * Warning: the ECDSA/RSA host key for 'hostname' differs from the key for the IP address '...' * First get the hostname. */ - startpos = strchr (buffer, '\'') + 1; + startpos = strchr (buffer, '\''); if (!startpos) return FALSE; + startpos++; endpos = strchr (startpos, '\''); if (!endpos) @@ -865,12 +866,13 @@ *hostname_out = g_strndup (startpos, endpos - startpos); /* Then get the ip address. */ - startpos = strchr (endpos + 1, '\'') + 1; + startpos = strchr (endpos + 1, '\''); if (!startpos) { g_free (hostname_out); return FALSE; } + startpos++; endpos = strchr (startpos, '\''); if (!endpos) diff -Nru gvfs-1.28.1/debian/changelog gvfs-1.28.2/debian/changelog --- gvfs-1.28.1/debian/changelog 2016-04-14 17:44:21.000000000 +0000 +++ gvfs-1.28.2/debian/changelog 2016-05-13 12:17:27.000000000 +0000 @@ -1,3 +1,23 @@ +gvfs (1.28.2-1ubuntu1) yakkety; urgency=low + + * Merge from Debian unstable. Remaining changes: + - Run tests through sudo starting as normal user, so that it can find a + non-root user. + - Drop libbluray-dev build dependency, it is in universe. + * Drop B/R for gvfs-backends-goa - this split is undone in an LTS now. + + -- Iain Lane Fri, 13 May 2016 13:17:23 +0100 + +gvfs (1.28.2-1) unstable; urgency=medium + + * New upstream release. + * Bump Standards-Version to 3.9.8. + * Drop lintian overrides as they are no longer needed. With recent versions + of lintian dh-exec >= 0.13 features are detected properly and binaries + are allowed to use "/usr/lib/$srcpkg/" in RPATHs. + + -- Michael Biebl Tue, 10 May 2016 19:49:52 +0200 + gvfs (1.28.1-1ubuntu1) xenial; urgency=medium * Merge with Debian unstable (LP: #1570251). Remaining Ubuntu changes: diff -Nru gvfs-1.28.1/debian/control gvfs-1.28.2/debian/control --- gvfs-1.28.1/debian/control 2016-04-14 17:44:23.000000000 +0000 +++ gvfs-1.28.2/debian/control 2016-05-13 12:17:50.000000000 +0000 @@ -46,7 +46,7 @@ systemd (>= 206) [linux-any], libgcr-3-dev, libgtk-3-dev -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Homepage: https://wiki.gnome.org/Projects/gvfs Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gvfs Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gvfs/ @@ -153,8 +153,6 @@ gvfs-libs (= ${binary:Version}), gvfs-common (= ${source:Version}), psmisc -Breaks: gvfs-backends-goa (<< 1.27.3) -Replaces: gvfs-backends-goa (<< 1.27.3) Recommends: gnome-keyring Suggests: bluez-obexd, samba-common Description: userspace virtual filesystem - backends diff -Nru gvfs-1.28.1/debian/control.in gvfs-1.28.2/debian/control.in --- gvfs-1.28.1/debian/control.in 2016-04-14 17:23:40.000000000 +0000 +++ gvfs-1.28.2/debian/control.in 2016-05-13 12:17:20.000000000 +0000 @@ -42,7 +42,7 @@ systemd (>= 206) [linux-any], libgcr-3-dev, libgtk-3-dev -Standards-Version: 3.9.7 +Standards-Version: 3.9.8 Homepage: https://wiki.gnome.org/Projects/gvfs Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gvfs Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gvfs/ @@ -149,8 +149,6 @@ gvfs-libs (= ${binary:Version}), gvfs-common (= ${source:Version}), psmisc -Breaks: gvfs-backends-goa (<< 1.27.3) -Replaces: gvfs-backends-goa (<< 1.27.3) Recommends: gnome-keyring Suggests: bluez-obexd, samba-common Description: userspace virtual filesystem - backends diff -Nru gvfs-1.28.1/debian/gvfs-daemons.lintian-overrides gvfs-1.28.2/debian/gvfs-daemons.lintian-overrides --- gvfs-1.28.1/debian/gvfs-daemons.lintian-overrides 2011-11-13 11:03:45.000000000 +0000 +++ gvfs-1.28.2/debian/gvfs-daemons.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -gvfs-daemons: binary-or-shlib-defines-rpath usr/lib/gvfs/gvfs* /usr/lib/*/gvfs diff -Nru gvfs-1.28.1/debian/gvfs-fuse.lintian-overrides gvfs-1.28.2/debian/gvfs-fuse.lintian-overrides --- gvfs-1.28.1/debian/gvfs-fuse.lintian-overrides 2011-11-13 11:03:45.000000000 +0000 +++ gvfs-1.28.2/debian/gvfs-fuse.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -gvfs-fuse: binary-or-shlib-defines-rpath usr/lib/gvfs/gvfs-fuse-daemon /usr/lib/*/gvfs diff -Nru gvfs-1.28.1/debian/gvfs.lintian-overrides gvfs-1.28.2/debian/gvfs.lintian-overrides --- gvfs-1.28.1/debian/gvfs.lintian-overrides 2011-11-13 11:03:45.000000000 +0000 +++ gvfs-1.28.2/debian/gvfs.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -gvfs: binary-or-shlib-defines-rpath usr/lib/*/gio/modules/lib*.so /usr/lib/*/gvfs diff -Nru gvfs-1.28.1/debian/source.lintian-overrides gvfs-1.28.2/debian/source.lintian-overrides --- gvfs-1.28.1/debian/source.lintian-overrides 2015-09-17 13:49:00.000000000 +0000 +++ gvfs-1.28.2/debian/source.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -# lintian needs updating to detect dh-exec >= 0.13 features. -gvfs source: dh-exec-script-without-dh-exec-features debian/gvfs-backends.install -gvfs source: dh-exec-script-without-dh-exec-features debian/gvfs-daemons.install diff -Nru gvfs-1.28.1/metadata/metadata-dbus.c gvfs-1.28.2/metadata/metadata-dbus.c --- gvfs-1.28.1/metadata/metadata-dbus.c 2016-04-11 14:46:17.000000000 +0000 +++ gvfs-1.28.2/metadata/metadata-dbus.c 2016-05-09 14:08:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/metadata/metadata-dbus.h gvfs-1.28.2/metadata/metadata-dbus.h --- gvfs-1.28.1/metadata/metadata-dbus.h 2016-04-11 14:46:17.000000000 +0000 +++ gvfs-1.28.2/metadata/metadata-dbus.h 2016-05-09 14:08:57.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/monitor/proxy/gvfsvolumemonitordbus.c gvfs-1.28.2/monitor/proxy/gvfsvolumemonitordbus.c --- gvfs-1.28.1/monitor/proxy/gvfsvolumemonitordbus.c 2016-04-11 14:46:18.000000000 +0000 +++ gvfs-1.28.2/monitor/proxy/gvfsvolumemonitordbus.c 2016-05-09 14:08:58.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/monitor/proxy/gvfsvolumemonitordbus.h gvfs-1.28.2/monitor/proxy/gvfsvolumemonitordbus.h --- gvfs-1.28.1/monitor/proxy/gvfsvolumemonitordbus.h 2016-04-11 14:46:18.000000000 +0000 +++ gvfs-1.28.2/monitor/proxy/gvfsvolumemonitordbus.h 2016-05-09 14:08:58.000000000 +0000 @@ -1,5 +1,5 @@ /* - * Generated by gdbus-codegen 2.47.6. DO NOT EDIT. + * Generated by gdbus-codegen 2.48.0. DO NOT EDIT. * * The license of this code is the same as for the source it was derived from. */ diff -Nru gvfs-1.28.1/monitor/udisks2/gvfsudisks2volume.c gvfs-1.28.2/monitor/udisks2/gvfsudisks2volume.c --- gvfs-1.28.1/monitor/udisks2/gvfsudisks2volume.c 2016-04-06 14:16:34.000000000 +0000 +++ gvfs-1.28.2/monitor/udisks2/gvfsudisks2volume.c 2016-05-09 13:54:47.000000000 +0000 @@ -608,10 +608,11 @@ gpointer user_data) { GVfsUDisks2Volume *volume = GVFS_UDISKS2_VOLUME (user_data); - MountData *data = volume->mount_pending_op; + MountData *data; update_volume_on_event (volume); + data = volume->mount_pending_op; if (data && data->mount_operation_aborted_handler_id && data->encrypted_to_unlock) { UDisksBlock *cleartext_block; diff -Nru gvfs-1.28.1/NEWS gvfs-1.28.2/NEWS --- gvfs-1.28.1/NEWS 2016-04-11 14:18:22.000000000 +0000 +++ gvfs-1.28.2/NEWS 2016-05-09 13:58:29.000000000 +0000 @@ -1,3 +1,8 @@ +Major changes in 1.28.2 +======================= +* udisks2: Fix crash when mounting encrypted volume +* Translation updates + Major changes in 1.28.1 ======================= * udisks2: Abort mount operation if volume is unlocked diff -Nru gvfs-1.28.1/po/pt.po gvfs-1.28.2/po/pt.po --- gvfs-1.28.1/po/pt.po 2016-03-24 15:20:25.000000000 +0000 +++ gvfs-1.28.2/po/pt.po 2016-05-09 13:54:57.000000000 +0000 @@ -3,22 +3,23 @@ # This file is distributed under the same license as the gvfs package. # Duarte Loreto , 2008, 2009, 2010, 2011, 2012, 2013. # Pedro Albuquerque , 2015. +# Sérgio Cardeira , 2016. # msgid "" msgstr "" "Project-Id-Version: 3.8\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=gvfs&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2015-11-28 00:34+0000\n" -"PO-Revision-Date: 2015-11-28 09:30+0000\n" -"Last-Translator: Pedro Albuquerque \n" -"Language-Team: Português \n" +"POT-Creation-Date: 2016-02-21 00:45+0000\n" +"PO-Revision-Date: 2016-02-21 02:56-0100\n" +"Last-Translator: Sérgio Cardeira \n" +"Language-Team: Português \n" "Language: pt\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\n" -"X-Generator: Gtranslator 2.91.6\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Gtranslator 2.91.7\n" #: ../client/gdaemonfile.c:467 ../client/gdaemonfile.c:2863 msgid "Operation not supported, files on different mounts" @@ -76,8 +77,7 @@ msgstr "Operação não é suportada" #: ../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 @@ -87,15 +87,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:5207 ../daemon/gvfsbackendsmb.c:1258 +#: ../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 "A operação foi cancelada" @@ -114,8 +114,8 @@ #: ../client/gdaemonfileinputstream.c:545 #: ../client/gdaemonfileinputstream.c:1715 #: ../client/gdaemonfileoutputstream.c:496 -#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2345 -#: ../daemon/gvfsbackendmtp.c:2717 +#: ../client/gdaemonfileoutputstream.c:1462 ../daemon/gvfsbackendmtp.c:2322 +#: ../daemon/gvfsbackendmtp.c:2702 msgid "End of stream" msgstr "Final do fluxo" @@ -195,39 +195,39 @@ #. translators: This is the default daemon's application name, #. * the %s is the type of the backend, like "FTP" -#: ../daemon/daemon-main.c:98 +#: ../daemon/daemon-main.c:100 #, c-format msgid "%s File System Service" msgstr "Serviço de sistema de ficheiros %s" -#: ../daemon/daemon-main.c:176 ../programs/gvfs-copy.c:104 +#: ../daemon/daemon-main.c:178 ../programs/gvfs-copy.c:104 #: ../programs/gvfs-move.c:102 ../programs/gvfs-rename.c:44 #: ../programs/gvfs-set-attribute.c:107 #, c-format msgid "Error: %s" msgstr "Erro: %s" -#: ../daemon/daemon-main.c:234 +#: ../daemon/daemon-main.c:236 #, c-format msgid "Usage: %s --spawner dbus-id object_path" msgstr "Utilização: %s -- spawner id-dbus caminho_objeto" -#: ../daemon/daemon-main.c:258 ../daemon/daemon-main.c:276 +#: ../daemon/daemon-main.c:260 ../daemon/daemon-main.c:278 #, c-format msgid "Usage: %s key=value key=value ..." msgstr "Utilização: %s chave=valor chave=valor ..." -#: ../daemon/daemon-main.c:274 +#: ../daemon/daemon-main.c:276 #, c-format msgid "No mount type specified" msgstr "Nenhum tipo de montagem especificado" -#: ../daemon/daemon-main.c:306 +#: ../daemon/daemon-main.c:308 #, c-format msgid "mountpoint for %s already running" msgstr "o ponto de montagem de %s já está em execução" -#: ../daemon/daemon-main.c:335 +#: ../daemon/daemon-main.c:337 msgid "error starting mount daemon" msgstr "Erro ao iniciar o daemon de montagem" @@ -381,8 +381,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:345 -#: ../daemon/gvfsbackendsftp.c:1091 ../daemon/gvfsbackendsftp.c:2120 +#: ../daemon/gvfsbackendgoogle.c:207 ../daemon/gvfsbackendsftp.c:337 +#: ../daemon/gvfsbackendsftp.c:1083 ../daemon/gvfsbackendsftp.c:2112 #: ../daemon/gvfsftptask.c:439 #, c-format msgid "Permission denied" @@ -392,16 +392,16 @@ #: ../daemon/gvfsafpvolume.c:2529 ../daemon/gvfsbackendafc.c:218 #: ../daemon/gvfsbackendafc.c:1019 ../daemon/gvfsbackendafpbrowse.c:190 #: ../daemon/gvfsbackendafpbrowse.c:327 ../daemon/gvfsbackendafpbrowse.c:359 -#: ../daemon/gvfsbackendarchive.c:744 ../daemon/gvfsbackendarchive.c:799 -#: ../daemon/gvfsbackendarchive.c:851 ../daemon/gvfsbackendarchive.c:880 +#: ../daemon/gvfsbackendarchive.c:736 ../daemon/gvfsbackendarchive.c:791 +#: ../daemon/gvfsbackendarchive.c:843 ../daemon/gvfsbackendarchive.c:872 #: ../daemon/gvfsbackendcdda.c:1024 ../daemon/gvfsbackendcomputer.c:639 -#: ../daemon/gvfsbackenddnssd.c:415 ../daemon/gvfsbackendftp.c:778 -#: ../daemon/gvfsbackendftp.c:1155 ../daemon/gvfsbackendmtp.c:1596 -#: ../daemon/gvfsbackendmtp.c:1612 ../daemon/gvfsbackendmtp.c:2066 -#: ../daemon/gvfsbackendmtp.c:2129 ../daemon/gvfsbackendmtp.c:2196 -#: ../daemon/gvfsbackendmtp.c:2542 ../daemon/gvfsbackendnetwork.c:696 -#: ../daemon/gvfsbackendsmbbrowse.c:1142 ../daemon/gvfsbackendsmbbrowse.c:1209 -#: ../daemon/gvfsbackendsmbbrowse.c:1396 ../daemon/gvfsbackendsmbbrowse.c:1469 +#: ../daemon/gvfsbackenddnssd.c:422 ../daemon/gvfsbackendftp.c:778 +#: ../daemon/gvfsbackendftp.c:1172 ../daemon/gvfsbackendmtp.c:1572 +#: ../daemon/gvfsbackendmtp.c:1588 ../daemon/gvfsbackendmtp.c:2042 +#: ../daemon/gvfsbackendmtp.c:2105 ../daemon/gvfsbackendmtp.c:2173 +#: ../daemon/gvfsbackendmtp.c:2527 ../daemon/gvfsbackendnetwork.c:696 +#: ../daemon/gvfsbackendsmbbrowse.c:1129 ../daemon/gvfsbackendsmbbrowse.c:1196 +#: ../daemon/gvfsbackendsmbbrowse.c:1383 ../daemon/gvfsbackendsmbbrowse.c:1456 #, c-format msgid "File doesn't exist" msgstr "O ficheiro não existe" @@ -411,9 +411,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:2635 ../daemon/gvfsbackendsftp.c:3410 -#: ../daemon/gvfsbackendsftp.c:3738 ../daemon/gvfsbackendsftp.c:4802 -#: ../daemon/gvfsbackendsftp.c:5727 +#: ../daemon/gvfsbackendsftp.c:2627 ../daemon/gvfsbackendsftp.c:3402 +#: ../daemon/gvfsbackendsftp.c:3730 ../daemon/gvfsbackendsftp.c:4794 +#: ../daemon/gvfsbackendsftp.c:5736 msgid "File is directory" msgstr "Ficheiro é uma pasta" @@ -427,7 +427,7 @@ #: ../daemon/gvfsafpvolume.c:688 ../daemon/gvfsbackendafc.c:222 #: ../daemon/gvfsbackendburn.c:421 ../daemon/gvfsbackenddav.c:2681 -#: ../daemon/gvfsbackendsftp.c:2114 +#: ../daemon/gvfsbackendsftp.c:2106 msgid "Directory not empty" msgstr "Pasta não vazia" @@ -459,13 +459,13 @@ #: ../daemon/gvfsbackenddav.c:2642 ../daemon/gvfsbackenddav.c:2750 #: ../daemon/gvfsbackenddav.c:2887 ../daemon/gvfsbackenddav.c:2963 #: ../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/gvfsbackendftp.c:794 ../daemon/gvfsbackendftp.c:982 +#: ../daemon/gvfsbackendftp.c:1492 ../daemon/gvfsbackendftp.c:1600 #: ../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:4811 ../daemon/gvfsbackendsmb.c:2209 +#: ../daemon/gvfsbackendmtp.c:1518 ../daemon/gvfsbackendmtp.c:1650 +#: ../daemon/gvfsbackendmtp.c:1976 ../daemon/gvfsbackendnfs.c:2486 +#: ../daemon/gvfsbackendsftp.c:4803 ../daemon/gvfsbackendsmb.c:2201 msgid "Target file already exists" msgstr "Já existe o ficheiro de destino" @@ -537,9 +537,9 @@ msgid "Range lock conflict exists" msgstr "Existe um conflito de obtenção de exclusividade em área" -#: ../daemon/gvfsafpvolume.c:2309 ../daemon/gvfsbackendmtp.c:1375 -#: ../daemon/gvfsbackendmtp.c:1400 ../daemon/gvfsbackendmtp.c:1550 -#: ../daemon/gvfsbackendmtp.c:1933 ../daemon/gvfsbackendmtp.c:2467 +#: ../daemon/gvfsafpvolume.c:2309 ../daemon/gvfsbackendmtp.c:1351 +#: ../daemon/gvfsbackendmtp.c:1376 ../daemon/gvfsbackendmtp.c:1526 +#: ../daemon/gvfsbackendmtp.c:1909 ../daemon/gvfsbackendmtp.c:2452 msgid "Directory doesn't exist" msgstr "Pasta não existe" @@ -624,14 +624,14 @@ #: ../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 "Cancelar" -#: ../daemon/gvfsbackendafc.c:461 ../daemon/gvfsbackendarchive.c:645 -#: ../daemon/gvfsbackendarchive.c:674 ../daemon/gvfsbackenddav.c:1848 +#: ../daemon/gvfsbackendafc.c:461 ../daemon/gvfsbackendarchive.c:637 +#: ../daemon/gvfsbackendarchive.c:666 ../daemon/gvfsbackenddav.c:1848 #: ../daemon/gvfsbackendgoogle.c:1664 ../daemon/gvfsbackendhttp.c:256 -#: ../daemon/gvfsbackendsmb.c:732 +#: ../daemon/gvfsbackendsmb.c:724 msgid "Invalid mount spec" msgstr "Especificação de montagem inválida" @@ -683,11 +683,11 @@ "O dispositivo “%s” está protegido. Insira a senha no dispositivo e prima " "“Tentar novamente”." -#: ../daemon/gvfsbackendafc.c:1009 ../daemon/gvfsbackendarchive.c:752 +#: ../daemon/gvfsbackendafc.c:1009 ../daemon/gvfsbackendarchive.c:744 #: ../daemon/gvfsbackendcomputer.c:657 ../daemon/gvfsbackendgoogle.c:2186 -#: ../daemon/gvfsbackendgphoto2.c:1820 ../daemon/gvfsbackendmtp.c:2218 +#: ../daemon/gvfsbackendgphoto2.c:1805 ../daemon/gvfsbackendmtp.c:2195 #: ../daemon/gvfsbackendnfs.c:347 ../daemon/gvfsbackendrecent.c:122 -#: ../daemon/gvfsbackendsmb.c:822 ../daemon/gvfsbackendtrash.c:234 +#: ../daemon/gvfsbackendsmb.c:814 ../daemon/gvfsbackendtrash.c:234 msgid "Can't open directory" msgstr "Impossível abrir a pasta" @@ -695,8 +695,8 @@ msgid "Backups are not yet supported." msgstr "Ainda não são suportadas cópias de segurança." -#: ../daemon/gvfsbackendafc.c:1375 ../daemon/gvfsbackendsmb.c:883 -#: ../daemon/gvfsbackendsmb.c:1362 +#: ../daemon/gvfsbackendafc.c:1375 ../daemon/gvfsbackendsmb.c:875 +#: ../daemon/gvfsbackendsmb.c:1354 msgid "Unsupported seek type" msgstr "Tipo de procura não suportado" @@ -705,31 +705,32 @@ #. * fallback copy. #. #: ../daemon/gvfsbackendafc.c:2435 ../daemon/gvfsbackendafp.c:1781 -#: ../daemon/gvfsbackendftp.c:1175 ../daemon/gvfsbackendftp.c:1223 -#: ../daemon/gvfsbackendftp.c:1244 ../daemon/gvfsbackendgoogle.c:1140 +#: ../daemon/gvfsbackendftp.c:1192 ../daemon/gvfsbackendftp.c:1240 +#: ../daemon/gvfsbackendftp.c:1261 ../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:2118 ../daemon/gvfsbackendsftp.c:5179 -#: ../daemon/gvfsbackendsmb.c:1853 ../daemon/gvfsftptask.c:431 +#: ../daemon/gvfsbackendmtp.c:1935 ../daemon/gvfsbackendmtp.c:2162 +#: ../daemon/gvfsbackendmtp.c:2357 ../daemon/gvfsbackendmtp.c:2428 +#: ../daemon/gvfsbackendmtp.c:2516 ../daemon/gvfsbackendmtp.c:2584 +#: ../daemon/gvfsbackendnfs.c:2368 ../daemon/gvfsbackendsftp.c:2110 +#: ../daemon/gvfsbackendsftp.c:5171 ../daemon/gvfsbackendsmb.c:1845 +#: ../daemon/gvfsftptask.c:431 msgid "Operation unsupported" msgstr "Operação não suportada" #: ../daemon/gvfsbackendafc.c:2601 ../daemon/gvfsbackenddav.c:2786 -#: ../daemon/gvfsbackendftp.c:1427 +#: ../daemon/gvfsbackendftp.c:1444 msgid "Backups not supported" msgstr "Não são suportadas cópias de segurança" #: ../daemon/gvfsbackendafpbrowse.c:218 ../daemon/gvfsbackendcomputer.c:958 #: ../daemon/gvfsbackendcomputer.c:1053 ../daemon/gvfsbackendcomputer.c:1159 #: ../daemon/gvfsbackendcomputer.c:1249 ../daemon/gvfsbackendcomputer.c:1322 -#: ../daemon/gvfsbackendcomputer.c:1391 ../daemon/gvfsbackendsmbbrowse.c:1137 -#: ../daemon/gvfsbackendsmbbrowse.c:1183 +#: ../daemon/gvfsbackendcomputer.c:1391 ../daemon/gvfsbackendsmbbrowse.c:1124 +#: ../daemon/gvfsbackendsmbbrowse.c:1170 msgid "Not a mountable file" msgstr "Não é um ficheiro montável" @@ -746,8 +747,8 @@ #. Translators: This is " on " 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:1975 ../daemon/gvfsbackendsmb.c:599 -#: ../daemon/gvfsbackendsmb.c:1536 +#: ../daemon/gvfsbackendsftp.c:1967 ../daemon/gvfsbackendsmb.c:591 +#: ../daemon/gvfsbackendsmb.c:1528 #, c-format msgid "%s on %s" msgstr "%s em %s" @@ -759,8 +760,8 @@ msgstr "%s" #: ../daemon/gvfsbackendafpbrowse.c:498 ../daemon/gvfsbackendafp.c:2139 -#: ../daemon/gvfsbackendarchive.c:634 ../daemon/gvfsbackendftp.c:706 -#: ../daemon/gvfsbackendnfs.c:197 ../daemon/gvfsbackendsftp.c:2027 +#: ../daemon/gvfsbackendarchive.c:626 ../daemon/gvfsbackendftp.c:706 +#: ../daemon/gvfsbackendnfs.c:197 ../daemon/gvfsbackendsftp.c:2019 msgid "No hostname specified" msgstr "Nenhum nome de máquina especificado" @@ -769,23 +770,23 @@ msgstr "Serviço do protocolo de ficheiros Apple" #: ../daemon/gvfsbackendafp.c:286 ../daemon/gvfsbackendburn.c:875 -#: ../daemon/gvfsbackenddav.c:2949 ../daemon/gvfsbackendftp.c:1575 +#: ../daemon/gvfsbackenddav.c:2949 ../daemon/gvfsbackendftp.c:1592 #: ../daemon/gvfsbackendgoogle.c:1806 msgid "Can't copy directory over directory" msgstr "Impossível copiar uma pasta sobre uma pasta" #: ../daemon/gvfsbackendafp.c:305 ../daemon/gvfsbackendburn.c:891 -#: ../daemon/gvfsbackenddav.c:2978 ../daemon/gvfsbackendftp.c:1598 +#: ../daemon/gvfsbackenddav.c:2978 ../daemon/gvfsbackendftp.c:1615 #: ../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 +#: ../daemon/gvfsbackendgoogle.c:1845 ../daemon/gvfsbackendmtp.c:1633 +#: ../daemon/gvfsbackendmtp.c:1656 ../daemon/gvfsbackendmtp.c:1958 +#: ../daemon/gvfsbackendmtp.c:1982 msgid "Can't recursively copy directory" msgstr "Impossível copiar pasta recursivamente" #: ../daemon/gvfsbackendafp.c:489 ../daemon/gvfsbackenddav.c:2826 -#: ../daemon/gvfsbackendnfs.c:2470 ../daemon/gvfsbackendsftp.c:4797 -#: ../daemon/gvfsbackendsmb.c:2198 +#: ../daemon/gvfsbackendnfs.c:2470 ../daemon/gvfsbackendsftp.c:4789 +#: ../daemon/gvfsbackendsmb.c:2190 msgid "Can't move directory over directory" msgstr "Impossível mover uma pasta sobre uma pasta" @@ -799,13 +800,13 @@ msgstr "Impossível criar o ficheiro temporário (%s)" #: ../daemon/gvfsbackendafp.c:1348 ../daemon/gvfsbackenddav.c:2427 -#: ../daemon/gvfsbackendnfs.c:1175 ../daemon/gvfsbackendsftp.c:3753 -#: ../daemon/gvfsbackendsmb.c:1235 +#: ../daemon/gvfsbackendnfs.c:1175 ../daemon/gvfsbackendsftp.c:3745 +#: ../daemon/gvfsbackendsmb.c:1227 msgid "The file was externally modified" msgstr "O ficheiro foi modificado externamente" -#: ../daemon/gvfsbackendafp.c:1765 ../daemon/gvfsbackendftp.c:1216 -#: ../daemon/gvfsbackendsftp.c:5189 +#: ../daemon/gvfsbackendafp.c:1765 ../daemon/gvfsbackendftp.c:1233 +#: ../daemon/gvfsbackendsftp.c:5181 msgid "Invalid attribute type (uint32 expected)" msgstr "Tipo de atributo inválido (esperado uint32)" @@ -822,18 +823,18 @@ #. 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 " -#: ../daemon/gvfsbackendarchive.c:356 ../daemon/gvfsbackendsftp.c:2571 +#: ../daemon/gvfsbackendarchive.c:348 ../daemon/gvfsbackendsftp.c:2563 #: ../daemon/gvfsftpdircache.c:431 #, c-format msgid "/ on %s" msgstr "/ em %s" -#: ../daemon/gvfsbackendarchive.c:889 ../daemon/gvfsbackendburn.c:679 -#: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:464 +#: ../daemon/gvfsbackendarchive.c:881 ../daemon/gvfsbackendburn.c:679 +#: ../daemon/gvfsbackendcomputer.c:729 ../daemon/gvfsbackenddnssd.c:471 #: ../daemon/gvfsbackendftp.c:354 ../daemon/gvfsbackendgoogle.c:684 #: ../daemon/gvfsbackendgoogle.c:1213 ../daemon/gvfsbackendgoogle.c:1328 #: ../daemon/gvfsbackendgoogle.c:1469 ../daemon/gvfsbackendnetwork.c:744 -#: ../daemon/gvfsbackendsftp.c:4289 ../daemon/gvfsftpdircache.c:157 +#: ../daemon/gvfsbackendsftp.c:4281 ../daemon/gvfsftpdircache.c:157 #, c-format msgid "The file is not a directory" msgstr "O ficheiro não é uma pasta" @@ -852,11 +853,11 @@ #: ../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:650 ../daemon/gvfsbackendgphoto2.c:1218 -#: ../daemon/gvfsbackendgphoto2.c:2141 ../daemon/gvfsbackendgphoto2.c:2859 +#: ../daemon/gvfsbackendgoogle.c:650 ../daemon/gvfsbackendgphoto2.c:1203 +#: ../daemon/gvfsbackendgphoto2.c:2126 ../daemon/gvfsbackendgphoto2.c:2844 #: ../daemon/gvfsbackendrecent.c:106 ../daemon/gvfsbackendrecent.c:287 -#: ../daemon/gvfsbackendsftp.c:2122 ../daemon/gvfsbackendsftp.c:3287 -#: ../daemon/gvfsbackendsftp.c:3300 ../daemon/gvfsbackendsftp.c:3320 +#: ../daemon/gvfsbackendsftp.c:2114 ../daemon/gvfsbackendsftp.c:3279 +#: ../daemon/gvfsbackendsftp.c:3292 ../daemon/gvfsbackendsftp.c:3312 #: ../daemon/gvfsbackendtrash.c:218 #, c-format msgid "No such file or directory" @@ -875,7 +876,7 @@ #: ../daemon/gvfsbackendburn.c:752 ../daemon/gvfsbackendburn.c:788 #: ../daemon/gvfsbackendburn.c:923 ../daemon/gvfsbackendburn.c:985 #: ../daemon/gvfsbackendburn.c:989 ../daemon/gvfsbackendburn.c:999 -#: ../daemon/gvfsbackendgphoto2.c:2933 +#: ../daemon/gvfsbackendgphoto2.c:2918 msgid "File exists" msgstr "Ficheiro existe" @@ -891,8 +892,8 @@ #: ../daemon/gvfsjobopeniconforread.c:104 ../daemon/gvfsjobpollmountable.c:107 #: ../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:123 +#: ../daemon/gvfsjobqueryinfo.c:124 ../daemon/gvfsjobqueryinforead.c:122 +#: ../daemon/gvfsjobqueryinfowrite.c:122 ../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 @@ -900,7 +901,7 @@ #: ../daemon/gvfsjobunmountmountable.c:157 #: ../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 "Operação não é suportada pelo motor" @@ -910,19 +911,19 @@ msgstr "Ficheiro ou pasta inexistente no caminho de destino" #: ../daemon/gvfsbackendburn.c:884 ../daemon/gvfsbackenddav.c:2864 -#: ../daemon/gvfsbackendsftp.c:2116 ../daemon/gvfsbackendsftp.c:4977 +#: ../daemon/gvfsbackendsftp.c:2108 ../daemon/gvfsbackendsftp.c:4969 msgid "Target file exists" msgstr "Ficheiro de destino já existe" #: ../daemon/gvfsbackendburn.c:949 ../daemon/gvfsbackendcomputer.c:812 #: ../daemon/gvfsbackenddav.c:3308 ../daemon/gvfsbackenddav.c:3340 -#: ../daemon/gvfsbackendgphoto2.c:2509 ../daemon/gvfsbackendgphoto2.c:2722 -#: ../daemon/gvfsbackendgphoto2.c:2819 ../daemon/gvfsbackendgphoto2.c:2912 -#: ../daemon/gvfsbackendgphoto2.c:3521 ../daemon/gvfsbackendgphoto2.c:3531 +#: ../daemon/gvfsbackendgphoto2.c:2494 ../daemon/gvfsbackendgphoto2.c:2707 +#: ../daemon/gvfsbackendgphoto2.c:2804 ../daemon/gvfsbackendgphoto2.c:2897 +#: ../daemon/gvfsbackendgphoto2.c:3506 ../daemon/gvfsbackendgphoto2.c:3516 #: ../daemon/gvfsbackendnfs.c:2418 ../daemon/gvfsbackendnfs.c:2544 -#: ../daemon/gvfsbackendsftp.c:5845 ../daemon/gvfsbackendsftp.c:5877 -#: ../daemon/gvfsbackendsftp.c:5903 ../daemon/gvfsbackendsftp.c:6375 -#: ../daemon/gvfsbackendsftp.c:6437 +#: ../daemon/gvfsbackendsftp.c:5854 ../daemon/gvfsbackendsftp.c:5886 +#: ../daemon/gvfsbackendsftp.c:5912 ../daemon/gvfsbackendsftp.c:6384 +#: ../daemon/gvfsbackendsftp.c:6446 msgid "Not supported" msgstr "Não suportado" @@ -932,12 +933,12 @@ msgstr "O sistema de ficheiros está ocupado" #: ../daemon/gvfsbackend.c:993 ../monitor/gdu/ggdumount.c:922 -#: ../monitor/udisks2/gvfsudisks2mount.c:781 +#: ../monitor/udisks2/gvfsudisks2mount.c:784 msgid "Unmount Anyway" msgstr "Ainda assim desmontar" #: ../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." @@ -945,20 +946,20 @@ "O volume está ocupado\n" "Uma ou mais aplicações estão a manter o volume ocupado." -#: ../daemon/gvfsbackendcdda.c:358 ../daemon/gvfsbackendgphoto2.c:1527 -#: ../daemon/gvfsbackendmtp.c:845 +#: ../daemon/gvfsbackendcdda.c:358 ../daemon/gvfsbackendgphoto2.c:1512 +#: ../daemon/gvfsbackendmtp.c:816 msgid "Cannot create gudev client" msgstr "Impossível criar cliente gudev" -#: ../daemon/gvfsbackendcdda.c:378 ../daemon/gvfsbackendgphoto2.c:1544 +#: ../daemon/gvfsbackendcdda.c:378 ../daemon/gvfsbackendgphoto2.c:1529 msgid "Cannot connect to the system bus" msgstr "Impossível ligar ao bus de sistema" -#: ../daemon/gvfsbackendcdda.c:389 ../daemon/gvfsbackendgphoto2.c:1555 +#: ../daemon/gvfsbackendcdda.c:389 ../daemon/gvfsbackendgphoto2.c:1540 msgid "Cannot create libhal context" msgstr "Impossível criar contexto de libhal" -#: ../daemon/gvfsbackendcdda.c:403 ../daemon/gvfsbackendgphoto2.c:1567 +#: ../daemon/gvfsbackendcdda.c:403 ../daemon/gvfsbackendgphoto2.c:1552 msgid "Cannot initialize libhal" msgstr "Impossível inicializar a libhal" @@ -1014,7 +1015,7 @@ msgid "Error seeking in stream on drive %s" msgstr "Erro ao procurar no fluxo na unidade %s" -#: ../daemon/gvfsbackendcdda.c:1017 ../daemon/gvfsbackendgphoto2.c:1828 +#: ../daemon/gvfsbackendcdda.c:1017 ../daemon/gvfsbackendgphoto2.c:1813 #, c-format msgid "No such file" msgstr "Ficheiro inexistente" @@ -1111,7 +1112,7 @@ #. translators: %s here is the hostname #. Translators: %s is the hostname #: ../daemon/gvfsbackenddav.c:1565 ../daemon/gvfsbackendftp.c:529 -#: ../daemon/gvfsbackendsftp.c:1137 +#: ../daemon/gvfsbackendsftp.c:1129 #, c-format msgid "Enter password for %s" msgstr "Insira a senha para %s" @@ -1129,11 +1130,11 @@ msgid "Could not create request" msgstr "Impossível criar pedido" -#: ../daemon/gvfsbackenddav.c:2458 ../daemon/gvfsbackendftp.c:1078 +#: ../daemon/gvfsbackenddav.c:2458 ../daemon/gvfsbackendftp.c:1085 #: ../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:2226 +#: ../daemon/gvfsbackendnfs.c:1388 ../daemon/gvfsbackendsmb.c:1263 +#: ../daemon/gvfsbackendsmb.c:2218 msgid "Backup file creation failed" msgstr "Falha ao criar o ficheiro de cópia de segurança" @@ -1145,32 +1146,32 @@ msgid "File length changed during transfer" msgstr "O tamanho do ficheiro mudou durante a transferência" -#: ../daemon/gvfsbackenddnssd.c:511 ../daemon/gvfsbackendnetwork.c:462 +#: ../daemon/gvfsbackenddnssd.c:518 ../daemon/gvfsbackendnetwork.c:462 msgid "Local Network" msgstr "Rede local" -#: ../daemon/gvfsbackenddnssd.c:758 ../daemon/gvfsbackendnetwork.c:851 +#: ../daemon/gvfsbackenddnssd.c:765 ../daemon/gvfsbackendnetwork.c:851 msgid "Can't monitor file or directory." msgstr "Impossível monitorizar ficheiro ou pasta." #. TODO: Names, etc -#: ../daemon/gvfsbackenddnssd.c:776 +#: ../daemon/gvfsbackenddnssd.c:783 msgid "Dns-SD" msgstr "Dns-SD" -#: ../daemon/gvfsbackenddnssd.c:777 ../daemon/gvfsbackendnetwork.c:783 +#: ../daemon/gvfsbackenddnssd.c:784 ../daemon/gvfsbackendnetwork.c:783 #: ../daemon/gvfsbackendnetwork.c:930 ../daemon/gvfsbackendnetwork.c:931 msgid "Network" msgstr "Rede" #. Translators: the first %s is the username, the second the host name -#: ../daemon/gvfsbackendftp.c:526 ../daemon/gvfsbackendsftp.c:1130 +#: ../daemon/gvfsbackendftp.c:526 ../daemon/gvfsbackendsftp.c:1122 #, c-format msgid "Enter password for %s on %s" msgstr "Insira a senha de %s em %s" -#: ../daemon/gvfsbackendftp.c:556 ../daemon/gvfsbackendsftp.c:1154 -#: ../daemon/gvfsbackendsmbbrowse.c:1037 ../daemon/gvfsbackendsmb.c:687 +#: ../daemon/gvfsbackendftp.c:556 ../daemon/gvfsbackendsftp.c:1146 +#: ../daemon/gvfsbackendsmbbrowse.c:1024 ../daemon/gvfsbackendsmb.c:679 msgid "Password dialog cancelled" msgstr "Diálogo de senha cancelado" @@ -1179,36 +1180,36 @@ msgstr "Permissões insuficientes" #: ../daemon/gvfsbackendgoogle.c:1713 ../daemon/gvfsbackendgoogle.c:2235 -#: ../daemon/gvfsbackendgphoto2.c:1861 +#: ../daemon/gvfsbackendgphoto2.c:1846 msgid "Error getting data from file" msgstr "Erro ao obter dados do ficheiro" -#: ../daemon/gvfsbackendgoogle.c:2193 ../daemon/gvfsbackendsftp.c:2295 -#: ../daemon/gvfsbackendsftp.c:2702 ../daemon/gvfsbackendsftp.c:2765 -#: ../daemon/gvfsbackendsftp.c:2776 ../daemon/gvfsbackendsftp.c:2834 -#: ../daemon/gvfsbackendsftp.c:2927 ../daemon/gvfsbackendsftp.c:2979 -#: ../daemon/gvfsbackendsftp.c:3034 ../daemon/gvfsbackendsftp.c:3113 -#: ../daemon/gvfsbackendsftp.c:3230 ../daemon/gvfsbackendsftp.c:3363 -#: ../daemon/gvfsbackendsftp.c:3447 ../daemon/gvfsbackendsftp.c:3523 -#: ../daemon/gvfsbackendsftp.c:3535 ../daemon/gvfsbackendsftp.c:3595 -#: ../daemon/gvfsbackendsftp.c:3637 ../daemon/gvfsbackendsftp.c:3825 -#: ../daemon/gvfsbackendsftp.c:3859 ../daemon/gvfsbackendsftp.c:3917 -#: ../daemon/gvfsbackendsftp.c:3976 ../daemon/gvfsbackendsftp.c:4047 -#: ../daemon/gvfsbackendsftp.c:4322 ../daemon/gvfsbackendsftp.c:4393 -#: ../daemon/gvfsbackendsftp.c:4528 ../daemon/gvfsbackendsftp.c:4636 -#: ../daemon/gvfsbackendsftp.c:4698 ../daemon/gvfsbackendsftp.c:4735 -#: ../daemon/gvfsbackendsftp.c:4763 ../daemon/gvfsbackendsftp.c:4877 -#: ../daemon/gvfsbackendsftp.c:4933 ../daemon/gvfsbackendsftp.c:4974 -#: ../daemon/gvfsbackendsftp.c:5010 ../daemon/gvfsbackendsftp.c:5046 -#: ../daemon/gvfsbackendsftp.c:5061 ../daemon/gvfsbackendsftp.c:5076 -#: ../daemon/gvfsbackendsftp.c:5160 ../daemon/gvfsbackendsftp.c:5330 -#: ../daemon/gvfsbackendsftp.c:5367 ../daemon/gvfsbackendsftp.c:5441 -#: ../daemon/gvfsbackendsftp.c:5527 ../daemon/gvfsbackendsftp.c:5611 -#: ../daemon/gvfsbackendsftp.c:5654 ../daemon/gvfsbackendsftp.c:5658 -#: ../daemon/gvfsbackendsftp.c:5775 ../daemon/gvfsbackendsftp.c:5779 -#: ../daemon/gvfsbackendsftp.c:6017 ../daemon/gvfsbackendsftp.c:6230 -#: ../daemon/gvfsbackendsftp.c:6247 ../daemon/gvfsbackendsftp.c:6381 -#: ../daemon/gvfsbackendsftp.c:6409 +#: ../daemon/gvfsbackendgoogle.c:2193 ../daemon/gvfsbackendsftp.c:2287 +#: ../daemon/gvfsbackendsftp.c:2694 ../daemon/gvfsbackendsftp.c:2757 +#: ../daemon/gvfsbackendsftp.c:2768 ../daemon/gvfsbackendsftp.c:2826 +#: ../daemon/gvfsbackendsftp.c:2919 ../daemon/gvfsbackendsftp.c:2971 +#: ../daemon/gvfsbackendsftp.c:3026 ../daemon/gvfsbackendsftp.c:3105 +#: ../daemon/gvfsbackendsftp.c:3222 ../daemon/gvfsbackendsftp.c:3355 +#: ../daemon/gvfsbackendsftp.c:3439 ../daemon/gvfsbackendsftp.c:3515 +#: ../daemon/gvfsbackendsftp.c:3527 ../daemon/gvfsbackendsftp.c:3587 +#: ../daemon/gvfsbackendsftp.c:3629 ../daemon/gvfsbackendsftp.c:3817 +#: ../daemon/gvfsbackendsftp.c:3851 ../daemon/gvfsbackendsftp.c:3909 +#: ../daemon/gvfsbackendsftp.c:3968 ../daemon/gvfsbackendsftp.c:4039 +#: ../daemon/gvfsbackendsftp.c:4314 ../daemon/gvfsbackendsftp.c:4385 +#: ../daemon/gvfsbackendsftp.c:4520 ../daemon/gvfsbackendsftp.c:4628 +#: ../daemon/gvfsbackendsftp.c:4690 ../daemon/gvfsbackendsftp.c:4727 +#: ../daemon/gvfsbackendsftp.c:4755 ../daemon/gvfsbackendsftp.c:4869 +#: ../daemon/gvfsbackendsftp.c:4925 ../daemon/gvfsbackendsftp.c:4966 +#: ../daemon/gvfsbackendsftp.c:5002 ../daemon/gvfsbackendsftp.c:5038 +#: ../daemon/gvfsbackendsftp.c:5053 ../daemon/gvfsbackendsftp.c:5068 +#: ../daemon/gvfsbackendsftp.c:5152 ../daemon/gvfsbackendsftp.c:5339 +#: ../daemon/gvfsbackendsftp.c:5376 ../daemon/gvfsbackendsftp.c:5450 +#: ../daemon/gvfsbackendsftp.c:5536 ../daemon/gvfsbackendsftp.c:5620 +#: ../daemon/gvfsbackendsftp.c:5663 ../daemon/gvfsbackendsftp.c:5667 +#: ../daemon/gvfsbackendsftp.c:5784 ../daemon/gvfsbackendsftp.c:5788 +#: ../daemon/gvfsbackendsftp.c:6026 ../daemon/gvfsbackendsftp.c:6239 +#: ../daemon/gvfsbackendsftp.c:6256 ../daemon/gvfsbackendsftp.c:6390 +#: ../daemon/gvfsbackendsftp.c:6418 msgid "Invalid reply received" msgstr "Recebida uma resposta inválida" @@ -1220,198 +1221,198 @@ msgid "Target file is not a regular file" msgstr "Ficheiro destino não é um ficheiro normal" -#: ../daemon/gvfsbackendgoogle.c:2786 ../daemon/gvfsbackendgphoto2.c:3321 +#: ../daemon/gvfsbackendgoogle.c:2786 ../daemon/gvfsbackendgphoto2.c:3306 msgid "Error writing file" msgstr "Erro ao escrever no ficheiro" -#: ../daemon/gvfsbackendgphoto2.c:516 +#: ../daemon/gvfsbackendgphoto2.c:493 #, c-format msgid "%s: %d: Directory or file exists" msgstr "%s: %d: pasta ou ficheiro já existe" -#: ../daemon/gvfsbackendgphoto2.c:523 +#: ../daemon/gvfsbackendgphoto2.c:500 #, c-format msgid "%s: %d: No such file or directory" msgstr "%s: %d: ficheiro ou pasta inexistente" -#: ../daemon/gvfsbackendgphoto2.c:529 +#: ../daemon/gvfsbackendgphoto2.c:506 #, c-format msgid "%s: %d: Invalid filename" msgstr "%s: %d: nome de ficheiro inválido" -#: ../daemon/gvfsbackendgphoto2.c:535 +#: ../daemon/gvfsbackendgphoto2.c:512 #, c-format msgid "%s: %d: Not Supported" msgstr "%s: %d: não suportado" #. Translator: %s represents the device, e.g. usb:001,042 -#: ../daemon/gvfsbackendgphoto2.c:736 ../daemon/gvfsbackendgphoto2.c:742 +#: ../daemon/gvfsbackendgphoto2.c:721 ../daemon/gvfsbackendgphoto2.c:727 #, c-format msgid "Digital Camera (%s)" msgstr "Câmara digital (%s)" #. Translator: %s is the vendor name, e.g. Panasonic #. Translators: %s is the device vendor -#: ../daemon/gvfsbackendgphoto2.c:953 ../monitor/gphoto2/ggphoto2volume.c:190 +#: ../daemon/gvfsbackendgphoto2.c:938 ../monitor/gphoto2/ggphoto2volume.c:190 #, c-format msgid "%s Camera" msgstr "Câmara %s" #. Translator: %s is the vendor name, e.g. Panasonic #. Translators: %s is the device vendor -#: ../daemon/gvfsbackendgphoto2.c:956 ../monitor/gphoto2/ggphoto2volume.c:185 +#: ../daemon/gvfsbackendgphoto2.c:941 ../monitor/gphoto2/ggphoto2volume.c:185 #, c-format msgid "%s Audio Player" msgstr "Reprodutor áudio %s" -#: ../daemon/gvfsbackendgphoto2.c:965 ../monitor/gphoto2/ggphoto2volume.c:199 +#: ../daemon/gvfsbackendgphoto2.c:950 ../monitor/gphoto2/ggphoto2volume.c:199 msgid "Camera" msgstr "Câmara" -#: ../daemon/gvfsbackendgphoto2.c:967 ../monitor/gphoto2/ggphoto2volume.c:197 +#: ../daemon/gvfsbackendgphoto2.c:952 ../monitor/gphoto2/ggphoto2volume.c:197 msgid "Audio Player" msgstr "Reprodutor áudio" -#: ../daemon/gvfsbackendgphoto2.c:1583 ../daemon/gvfsbackendmtp.c:837 +#: ../daemon/gvfsbackendgphoto2.c:1568 ../daemon/gvfsbackendmtp.c:808 msgid "No device specified" msgstr "Nenhum dispositivo especificado" -#: ../daemon/gvfsbackendgphoto2.c:1603 +#: ../daemon/gvfsbackendgphoto2.c:1588 msgid "Cannot create gphoto2 context" msgstr "Impossível criar contexto gphoto2" -#: ../daemon/gvfsbackendgphoto2.c:1612 +#: ../daemon/gvfsbackendgphoto2.c:1597 msgid "Error creating camera" msgstr "Erro ao criar a câmara" -#: ../daemon/gvfsbackendgphoto2.c:1624 ../daemon/gvfsbackendgphoto2.c:1633 +#: ../daemon/gvfsbackendgphoto2.c:1609 ../daemon/gvfsbackendgphoto2.c:1618 msgid "Error loading device information" msgstr "Erro ao ler a informação do dispositivo" -#: ../daemon/gvfsbackendgphoto2.c:1644 +#: ../daemon/gvfsbackendgphoto2.c:1629 msgid "Error looking up device information" msgstr "Erro ao procurar a informação de dispositivo" -#: ../daemon/gvfsbackendgphoto2.c:1653 +#: ../daemon/gvfsbackendgphoto2.c:1638 msgid "Error getting device information" msgstr "Erro ao obter a informação do dispositivo" -#: ../daemon/gvfsbackendgphoto2.c:1667 +#: ../daemon/gvfsbackendgphoto2.c:1652 msgid "Error setting up camera communications port" msgstr "Erro ao definir o porto de comunicação da câmara" -#: ../daemon/gvfsbackendgphoto2.c:1677 +#: ../daemon/gvfsbackendgphoto2.c:1662 msgid "Error initializing camera" msgstr "Erro ao inicializar a câmara" #. Translator: %s represents the device, e.g. usb:001,042. 'gphoto2' is the name of the #. backend and shouldn't be translated. -#: ../daemon/gvfsbackendgphoto2.c:1688 +#: ../daemon/gvfsbackendgphoto2.c:1673 #, c-format msgid "gphoto2 mount on %s" msgstr "ponto de montagem gphoto2 em %s" -#: ../daemon/gvfsbackendgphoto2.c:1774 +#: ../daemon/gvfsbackendgphoto2.c:1759 msgid "No camera specified" msgstr "Nenhuma câmara especificada" -#: ../daemon/gvfsbackendgphoto2.c:1836 ../daemon/gvfsbackendgphoto2.c:3562 +#: ../daemon/gvfsbackendgphoto2.c:1821 ../daemon/gvfsbackendgphoto2.c:3547 msgid "Error creating file object" msgstr "Erro ao criar objeto de ficheiro" -#: ../daemon/gvfsbackendgphoto2.c:1851 ../daemon/gvfsbackendgphoto2.c:3593 +#: ../daemon/gvfsbackendgphoto2.c:1836 ../daemon/gvfsbackendgphoto2.c:3578 msgid "Error getting file" msgstr "Erro ao obter o ficheiro" -#: ../daemon/gvfsbackendgphoto2.c:1919 ../daemon/gvfsbackendmtp.c:2308 +#: ../daemon/gvfsbackendgphoto2.c:1904 ../daemon/gvfsbackendmtp.c:2285 #, c-format msgid "Malformed icon identifier '%s'" msgstr "Identificador de ícone \"%s\" mal-formado" -#: ../daemon/gvfsbackendgphoto2.c:1995 ../daemon/gvfsbackendgphoto2.c:3184 +#: ../daemon/gvfsbackendgphoto2.c:1980 ../daemon/gvfsbackendgphoto2.c:3169 #, c-format msgid "Error seeking in stream on camera %s" msgstr "Erro ao procurar no fluxo na câmara %s" -#: ../daemon/gvfsbackendgphoto2.c:2135 ../daemon/gvfsbackendsftp.c:3290 -#: ../daemon/gvfsbackendsmbbrowse.c:1465 +#: ../daemon/gvfsbackendgphoto2.c:2120 ../daemon/gvfsbackendsftp.c:3282 +#: ../daemon/gvfsbackendsmbbrowse.c:1452 msgid "Not a directory" msgstr "Não é uma pasta" -#: ../daemon/gvfsbackendgphoto2.c:2168 +#: ../daemon/gvfsbackendgphoto2.c:2153 msgid "Failed to get folder list" msgstr "Falha ao obter a lista de pastas" -#: ../daemon/gvfsbackendgphoto2.c:2233 +#: ../daemon/gvfsbackendgphoto2.c:2218 msgid "Failed to get file list" msgstr "Falha ao obter a lista de ficheiros" -#: ../daemon/gvfsbackendgphoto2.c:2521 +#: ../daemon/gvfsbackendgphoto2.c:2506 msgid "Error creating directory" msgstr "Erro ao criar pasta" -#: ../daemon/gvfsbackendgphoto2.c:2734 +#: ../daemon/gvfsbackendgphoto2.c:2719 msgid "Name already exists" msgstr "Nome já existe" -#: ../daemon/gvfsbackendgphoto2.c:2745 ../daemon/gvfsbackendgphoto2.c:3413 +#: ../daemon/gvfsbackendgphoto2.c:2730 ../daemon/gvfsbackendgphoto2.c:3398 msgid "New name too long" msgstr "Novo nome demasiado extenso" -#: ../daemon/gvfsbackendgphoto2.c:2755 ../daemon/gvfsbackendgphoto2.c:3424 +#: ../daemon/gvfsbackendgphoto2.c:2740 ../daemon/gvfsbackendgphoto2.c:3409 msgid "Error renaming directory" msgstr "Erro ao renomear a pasta" -#: ../daemon/gvfsbackendgphoto2.c:2768 ../daemon/gvfsbackendgphoto2.c:3437 +#: ../daemon/gvfsbackendgphoto2.c:2753 ../daemon/gvfsbackendgphoto2.c:3422 msgid "Error renaming file" msgstr "Erro ao renomear ficheiro" -#: ../daemon/gvfsbackendgphoto2.c:2832 +#: ../daemon/gvfsbackendgphoto2.c:2817 #, c-format msgid "Directory '%s' is not empty" msgstr "Pasta \"%s\" não está vazia" -#: ../daemon/gvfsbackendgphoto2.c:2843 +#: ../daemon/gvfsbackendgphoto2.c:2828 msgid "Error deleting directory" msgstr "Erro ao apagar a pasta" -#: ../daemon/gvfsbackendgphoto2.c:2869 ../daemon/gvfsbackendgphoto2.c:3614 +#: ../daemon/gvfsbackendgphoto2.c:2854 ../daemon/gvfsbackendgphoto2.c:3599 msgid "Error deleting file" msgstr "Erro ao apagar o ficheiro" -#: ../daemon/gvfsbackendgphoto2.c:2922 +#: ../daemon/gvfsbackendgphoto2.c:2907 msgid "Can't write to directory" msgstr "Impossível gravar na pasta" -#: ../daemon/gvfsbackendgphoto2.c:2969 +#: ../daemon/gvfsbackendgphoto2.c:2954 msgid "Cannot allocate new file to append to" msgstr "Impossível alocar novo ficheiro ao qual acrescentar" -#: ../daemon/gvfsbackendgphoto2.c:2984 +#: ../daemon/gvfsbackendgphoto2.c:2969 msgid "Cannot read file to append to" msgstr "Impossível ler o ficheiro ao qual acrescentar" -#: ../daemon/gvfsbackendgphoto2.c:2995 +#: ../daemon/gvfsbackendgphoto2.c:2980 msgid "Cannot get data of file to append to" msgstr "Impossível obter dados do ficheiro ao qual acrescentar" -#: ../daemon/gvfsbackendgphoto2.c:3369 +#: ../daemon/gvfsbackendgphoto2.c:3354 msgid "Not supported (not same directory)" msgstr "Não suportado (não é a mesma pasta)" -#: ../daemon/gvfsbackendgphoto2.c:3381 +#: ../daemon/gvfsbackendgphoto2.c:3366 msgid "" "Not supported (the source is a directory, the destination is a directory too)" msgstr "Não suportado (origem é uma pasta, destino também é uma pasta)" -#: ../daemon/gvfsbackendgphoto2.c:3389 +#: ../daemon/gvfsbackendgphoto2.c:3374 msgid "" "Not supported (the source is a directory, but the destination is an existing " "file)" msgstr "" "Não suportado (origem é uma pasta mas o destino é um ficheiro existente)" -#: ../daemon/gvfsbackendgphoto2.c:3401 +#: ../daemon/gvfsbackendgphoto2.c:3386 msgid "" "Not supported (the source is a file, but the destination is a directory)" msgstr "Não suportado (a origem é um ficheiro mas o destino é uma pasta)" @@ -1425,81 +1426,81 @@ msgid "Directory notification not supported" msgstr "Notificação de pasta não suportada" -#: ../daemon/gvfsbackendmtp.c:549 +#: ../daemon/gvfsbackendmtp.c:520 msgid "Unknown error." msgstr "Erro desconhecido." -#: ../daemon/gvfsbackendmtp.c:555 +#: ../daemon/gvfsbackendmtp.c:526 #, c-format msgid "libmtp error: %s" msgstr "Erro libmtp: %s" -#: ../daemon/gvfsbackendmtp.c:791 +#: ../daemon/gvfsbackendmtp.c:762 msgid "Unexpected host URI format." msgstr "Formato de URI do servidor inesperado." -#: ../daemon/gvfsbackendmtp.c:801 +#: ../daemon/gvfsbackendmtp.c:772 msgid "Malformed host URI." msgstr "URI de servidor mal formado." -#: ../daemon/gvfsbackendmtp.c:814 +#: ../daemon/gvfsbackendmtp.c:785 msgid "Couldn't find matching udev device." msgstr "Impossível encontrar dispositivo udev coincidente." -#: ../daemon/gvfsbackendmtp.c:980 +#: ../daemon/gvfsbackendmtp.c:951 msgid "No MTP devices found" msgstr "Nenhum dispositivo MTP encontrado" -#: ../daemon/gvfsbackendmtp.c:985 +#: ../daemon/gvfsbackendmtp.c:956 msgid "Unable to connect to MTP device" msgstr "Impossível ligar ao despositivo MTP" -#: ../daemon/gvfsbackendmtp.c:990 +#: ../daemon/gvfsbackendmtp.c:961 msgid "Unable to allocate memory while detecting MTP devices" msgstr "Impossível alocar memória enquanto deteta dispositivos MTP" -#: ../daemon/gvfsbackendmtp.c:996 +#: ../daemon/gvfsbackendmtp.c:967 msgid "Generic libmtp error" msgstr "Erro genérico do libmtp" -#: ../daemon/gvfsbackendmtp.c:1013 +#: ../daemon/gvfsbackendmtp.c:984 #, c-format msgid "Unable to open MTP device '%s'" msgstr "Impossível abrir o dispositivo MTP \"%s\"" -#: ../daemon/gvfsbackendmtp.c:1033 +#: ../daemon/gvfsbackendmtp.c:1004 msgid "Device not found" msgstr "Dispositivo não encontrado" -#: ../daemon/gvfsbackendmtp.c:1303 ../daemon/gvfsbackendmtp.c:1411 -#: ../daemon/gvfsbackendmtp.c:1463 +#: ../daemon/gvfsbackendmtp.c:1279 ../daemon/gvfsbackendmtp.c:1387 +#: ../daemon/gvfsbackendmtp.c:1439 msgid "File not found" msgstr "Ficheiro não encontrado" -#: ../daemon/gvfsbackendmtp.c:1531 +#: ../daemon/gvfsbackendmtp.c:1507 msgid "Cannot make directory in this location" msgstr "Impossível criar uma pasta nesta localização" -#: ../daemon/gvfsbackendmtp.c:1601 ../daemon/gvfsbackendmtp.c:2071 -#: ../daemon/gvfsbackendmtp.c:2134 ../daemon/gvfsbackendmtp.c:2201 -#: ../daemon/gvfsbackendmtp.c:2547 ../daemon/gvfsbackendmtp.c:2613 -#: ../daemon/gvfsbackendsmbbrowse.c:1205 +#: ../daemon/gvfsbackendmtp.c:1577 ../daemon/gvfsbackendmtp.c:2047 +#: ../daemon/gvfsbackendmtp.c:2110 ../daemon/gvfsbackendmtp.c:2178 +#: ../daemon/gvfsbackendmtp.c:2532 ../daemon/gvfsbackendmtp.c:2598 +#: ../daemon/gvfsbackendsmbbrowse.c:1192 msgid "Not a regular file" msgstr "Não é um ficheiro comum" -#: ../daemon/gvfsbackendmtp.c:1647 ../daemon/gvfsbackendmtp.c:1972 +#: ../daemon/gvfsbackendmtp.c:1623 ../daemon/gvfsbackendmtp.c:1948 msgid "Target is a directory" msgstr "O destino é uma pasta" -#: ../daemon/gvfsbackendmtp.c:1652 ../daemon/gvfsbackendmtp.c:1977 +#: ../daemon/gvfsbackendmtp.c:1628 ../daemon/gvfsbackendmtp.c:1953 msgid "Can't merge directories" msgstr "Impossível unir pastas" -#: ../daemon/gvfsbackendmtp.c:1910 ../daemon/gvfsbackendmtp.c:2459 +#: ../daemon/gvfsbackendmtp.c:1886 ../daemon/gvfsbackendmtp.c:2444 msgid "Cannot write to this location" msgstr "Impossível gravar nesta localização" -#: ../daemon/gvfsbackendmtp.c:2290 +#: ../daemon/gvfsbackendmtp.c:2267 #, c-format msgid "No thumbnail for entity '%s'" msgstr "Nenhuma miniatura para a entidade \"%s\"" @@ -1512,13 +1513,13 @@ msgid "Remote Login" msgstr "Início de sessão remota" -#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:924 +#: ../daemon/gvfsbackendnetwork.c:333 ../daemon/gvfsbackendsmbbrowse.c:911 msgid "Windows Network" msgstr "Rede Windows" #. Translators: this is the friendly name of the 'network://' backend that #. * shows computers in your local network. -#: ../daemon/gvfsbackendnetwork.c:989 +#: ../daemon/gvfsbackendnetwork.c:1011 msgid "Network Location Monitor" msgstr "Monitor de localizações na Rede" @@ -1535,8 +1536,8 @@ "uma porta privilegiada" #: ../daemon/gvfsbackendnfs.c:1046 ../daemon/gvfsbackendnfs.c:1069 -#: ../daemon/gvfsbackendnfs.c:1117 ../daemon/gvfsbackendsftp.c:3673 -#: ../daemon/gvfsbackendsftp.c:5682 +#: ../daemon/gvfsbackendnfs.c:1117 ../daemon/gvfsbackendsftp.c:3665 +#: ../daemon/gvfsbackendsftp.c:5691 msgid "Unable to create temporary file" msgstr "Impossível criar o ficheiro temporário" @@ -1554,77 +1555,76 @@ msgid "Recent" msgstr "Recente" -#: ../daemon/gvfsbackendsftp.c:336 ../daemon/gvfsbackendsftp.c:710 +#: ../daemon/gvfsbackendsftp.c:328 ../daemon/gvfsbackendsftp.c:704 msgid "Connection failed" msgstr "A ligação falhou" -#: ../daemon/gvfsbackendsftp.c:352 +#: ../daemon/gvfsbackendsftp.c:344 msgid "Hostname not known" msgstr "Nome de máquina desconhecido" -#: ../daemon/gvfsbackendsftp.c:359 +#: ../daemon/gvfsbackendsftp.c:351 msgid "No route to host" msgstr "Nenhum caminho para a máquina" -#: ../daemon/gvfsbackendsftp.c:367 +#: ../daemon/gvfsbackendsftp.c:359 msgid "Connection refused by server" msgstr "Ligação recusada pelo servidor" -#: ../daemon/gvfsbackendsftp.c:374 +#: ../daemon/gvfsbackendsftp.c:366 msgid "Host key verification failed" msgstr "Falha na verificação da chave da máquina" -#: ../daemon/gvfsbackendsftp.c:381 -#| msgid "Host key verification failed" +#: ../daemon/gvfsbackendsftp.c:373 msgid "Too many authentication failures" msgstr "Demasiadas falhas na autenticação" -#: ../daemon/gvfsbackendsftp.c:554 +#: ../daemon/gvfsbackendsftp.c:548 msgid "Unable to spawn SSH program" msgstr "Impossível iniciar aplicação SSH" -#: ../daemon/gvfsbackendsftp.c:570 +#: ../daemon/gvfsbackendsftp.c:564 #, c-format msgid "Unable to spawn SSH program: %s" msgstr "Impossível iniciar aplicação SSH: %s" -#: ../daemon/gvfsbackendsftp.c:672 ../daemon/gvfsbackendsftp.c:1025 +#: ../daemon/gvfsbackendsftp.c:666 ../daemon/gvfsbackendsftp.c:1017 msgid "Timed out when logging in" msgstr "Tempo expirou ao iniciar sessão" -#: ../daemon/gvfsbackendsftp.c:899 +#: ../daemon/gvfsbackendsftp.c:893 msgid "Log In Anyway" msgstr "Ainda assim iniciar sessão" -#: ../daemon/gvfsbackendsftp.c:899 +#: ../daemon/gvfsbackendsftp.c:893 msgid "Cancel Login" msgstr "Cancelar início de sessão" -#: ../daemon/gvfsbackendsftp.c:914 +#: ../daemon/gvfsbackendsftp.c:908 msgid "Login dialog cancelled" msgstr "Diálogo de início de sessão cancelado" -#: ../daemon/gvfsbackendsftp.c:933 +#: ../daemon/gvfsbackendsftp.c:927 msgid "Can't send host identity confirmation" msgstr "Impossível enviar confirmação de identidade da máquina" #. Translators: the first %s is the username, the second the host name -#: ../daemon/gvfsbackendsftp.c:1127 +#: ../daemon/gvfsbackendsftp.c:1119 #, c-format msgid "Enter passphrase for secure key for %s on %s" msgstr "Insira a frase-passe para a chave segura de %s em %s" #. Translators: %s is the hostname -#: ../daemon/gvfsbackendsftp.c:1134 +#: ../daemon/gvfsbackendsftp.c:1126 #, c-format msgid "Enter passphrase for secure key for %s" msgstr "Insira a frase-passe para a chave segura em %s" -#: ../daemon/gvfsbackendsftp.c:1226 +#: ../daemon/gvfsbackendsftp.c:1218 msgid "Can't send password" msgstr "Impossível enviar a senha" -#: ../daemon/gvfsbackendsftp.c:1242 +#: ../daemon/gvfsbackendsftp.c:1234 #, c-format msgid "" "Can't verify the identity of “%s”.\n" @@ -1640,7 +1640,7 @@ "certeza absoluta de que é seguro prosseguir, contacte o administrador do " "sistema." -#: ../daemon/gvfsbackendsftp.c:1269 +#: ../daemon/gvfsbackendsftp.c:1261 #, c-format msgid "" "The host key for “%s” differs from the key for the IP address “%s”\n" @@ -1654,117 +1654,117 @@ "certeza absoluta de que é seguro prosseguir, contacte o administrador do " "sistema." -#: ../daemon/gvfsbackendsftp.c:1360 +#: ../daemon/gvfsbackendsftp.c:1352 #, c-format msgid "The connection is closed (the underlying SSH process exited)" msgstr "A ligação está fechada (o processo SSH subjacente saiu)" -#: ../daemon/gvfsbackendsftp.c:1361 +#: ../daemon/gvfsbackendsftp.c:1353 #, c-format msgid "Internal error: Unknown Error" msgstr "Erro interno: erro desconhecido" -#: ../daemon/gvfsbackendsftp.c:1875 ../daemon/gvfsbackendsftp.c:1902 +#: ../daemon/gvfsbackendsftp.c:1867 ../daemon/gvfsbackendsftp.c:1894 msgid "Protocol error" msgstr "Erro de protocolo" -#: ../daemon/gvfsbackendsftp.c:2017 +#: ../daemon/gvfsbackendsftp.c:2009 msgid "Unable to find supported SSH command" msgstr "Impossível encontrar comando SSH suportado" -#: ../daemon/gvfsbackendsftp.c:2559 ../daemon/gvfsbackendsmb.c:1543 +#: ../daemon/gvfsbackendsftp.c:2551 ../daemon/gvfsbackendsmb.c:1535 #: ../daemon/gvfsdaemonutils.c:140 msgid " (invalid encoding)" msgstr " (codificação inválida)" -#: ../daemon/gvfsbackendsftp.c:2644 +#: ../daemon/gvfsbackendsftp.c:2636 msgid "Failure" msgstr "Falha" -#: ../daemon/gvfsbackendsftp.c:3056 +#: ../daemon/gvfsbackendsftp.c:3048 #, c-format msgid "Error creating backup file: %s" msgstr "Erro ao criar ficheiro de cópia de segurança: %s" -#: ../daemon/gvfsbackendsftp.c:3623 ../daemon/gvfsbackendsftp.c:3799 +#: ../daemon/gvfsbackendsftp.c:3615 ../daemon/gvfsbackendsftp.c:3791 msgid "backups not supported yet" msgstr "ainda não são suportadas cópias de segurança" #. translators: %s is a server name -#: ../daemon/gvfsbackendsmbbrowse.c:379 +#: ../daemon/gvfsbackendsmbbrowse.c:370 #, c-format msgid "Password required for %s" msgstr "Senha necessária para %s" -#: ../daemon/gvfsbackendsmbbrowse.c:863 ../daemon/gvfsbackendsmbbrowse.c:906 -#: ../daemon/gvfsbackendsmb.c:544 ../daemon/gvfsbackendsmb.c:585 -#: ../daemon/gvfsbackendsmb.c:768 +#: ../daemon/gvfsbackendsmbbrowse.c:854 ../daemon/gvfsbackendsmbbrowse.c:893 +#: ../daemon/gvfsbackendsmb.c:536 ../daemon/gvfsbackendsmb.c:577 +#: ../daemon/gvfsbackendsmb.c:760 #, c-format msgid "Internal Error (%s)" msgstr "Erro interno (%s)" #. translators: Name for the location that lists the smb shares #. availible on a server (%s is the name of the server) -#: ../daemon/gvfsbackendsmbbrowse.c:933 +#: ../daemon/gvfsbackendsmbbrowse.c:920 #, c-format msgid "Windows shares on %s" msgstr "Partilha Windows em %s" #. translators: We tried to mount a windows (samba) share, but failed -#: ../daemon/gvfsbackendsmbbrowse.c:1042 +#: ../daemon/gvfsbackendsmbbrowse.c:1029 #, c-format msgid "Failed to retrieve share list from server: %s" msgstr "Falha ao obter a lista de partilhas do servidor: %s" -#: ../daemon/gvfsbackendsmbbrowse.c:1567 +#: ../daemon/gvfsbackendsmbbrowse.c:1554 msgid "Windows Network File System Service" msgstr "Serviço de sistema de ficheiros de rede Windows" #. translators: First %s is a share name, second is a server name -#: ../daemon/gvfsbackendsmb.c:273 +#: ../daemon/gvfsbackendsmb.c:265 #, c-format msgid "Password required for share %s on %s" msgstr "Senha necessária para a partilha %s em %s" #. translators: We tried to mount a windows (samba) share, but failed -#: ../daemon/gvfsbackendsmb.c:692 +#: ../daemon/gvfsbackendsmb.c:684 #, c-format msgid "Failed to mount Windows share: %s" msgstr "Falha ao montar partilha Windows: %s" -#: ../daemon/gvfsbackendsmb.c:1470 +#: ../daemon/gvfsbackendsmb.c:1462 #, c-format msgid "Backup file creation failed: %s" msgstr "Falha ao criar o ficheiro de cópia de segurança: %s" -#: ../daemon/gvfsbackendsmb.c:1878 +#: ../daemon/gvfsbackendsmb.c:1870 msgid "Invalid attribute type (uint64 expected)" msgstr "Tipo de atributo inválido (esperado uint64)" -#: ../daemon/gvfsbackendsmb.c:2049 +#: ../daemon/gvfsbackendsmb.c:2041 msgid "Can't rename file, filename already exists" msgstr "Impossível renomear o ficheiro, o nome já existe" -#: ../daemon/gvfsbackendsmb.c:2100 +#: ../daemon/gvfsbackendsmb.c:2092 #, c-format msgid "Error deleting file: %s" msgstr "Erro ao eliminar o ficheiro: %s" -#: ../daemon/gvfsbackendsmb.c:2174 +#: ../daemon/gvfsbackendsmb.c:2166 #, c-format msgid "Error moving file: %s" msgstr "Erro ao mover o ficheiro: %s" -#: ../daemon/gvfsbackendsmb.c:2246 +#: ../daemon/gvfsbackendsmb.c:2238 #, c-format msgid "Error removing target file: %s" msgstr "Erro ao remover o ficheiro destino: %s" -#: ../daemon/gvfsbackendsmb.c:2270 +#: ../daemon/gvfsbackendsmb.c:2262 msgid "Can't recursively move directory" msgstr "Impossível mover pasta recursivamente" -#: ../daemon/gvfsbackendsmb.c:2316 +#: ../daemon/gvfsbackendsmb.c:2308 msgid "Windows Shares File System Service" msgstr "Serviço de sistema de ficheiros partilhado Windows" @@ -1903,7 +1903,6 @@ msgstr "Nome de ficheiro inválido" #: ../daemon/gvfshttpinputstream.c:293 -#| msgid "Error seeking in stream on drive %s" msgid "Error seeking in stream" msgstr "Erro ao procurar no fluxo" @@ -1915,7 +1914,7 @@ msgid "Invalid dbus message" msgstr "Mensagem dbus inválida" -#: ../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 foi desmontado\n" @@ -1929,34 +1928,38 @@ "A desmontar %s\n" "Aguarde por favor" -#: ../daemon/main.c:148 ../metadata/meta-daemon.c:377 +#: ../daemon/main.c:150 ../metadata/meta-daemon.c:377 msgid "Replace old daemon." msgstr "Substituir o daemon antigo." -#: ../daemon/main.c:149 +#: ../daemon/main.c:151 msgid "Don't start fuse." msgstr "Não iniciar o fuse." -#: ../daemon/main.c:150 ../metadata/meta-daemon.c:378 +#: ../daemon/main.c:152 +msgid "Enable debug output." +msgstr "Ativar modo de depuração." + +#: ../daemon/main.c:153 ../metadata/meta-daemon.c:378 msgid "Show program version." msgstr "Mostrar versão da aplicação." -#: ../daemon/main.c:164 +#: ../daemon/main.c:169 msgid "GVFS Daemon" msgstr "Daemon GVFS" -#: ../daemon/main.c:167 +#: ../daemon/main.c:172 msgid "Main daemon for GVFS" msgstr "Daemon principal do GVFS" #. Translators: the first %s is the application name, #. the second %s is the error message -#: ../daemon/main.c:183 ../metadata/meta-daemon.c:404 +#: ../daemon/main.c:189 ../metadata/meta-daemon.c:404 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: ../daemon/main.c:185 ../metadata/meta-daemon.c:406 +#: ../daemon/main.c:191 ../metadata/meta-daemon.c:406 #: ../programs/gvfs-cat.c:170 ../programs/gvfs-cat.c:188 #: ../programs/gvfs-copy.c:146 ../programs/gvfs-info.c:398 #: ../programs/gvfs-ls.c:425 ../programs/gvfs-mime.c:97 @@ -1965,31 +1968,31 @@ #: ../programs/gvfs-monitor-file.c:134 ../programs/gvfs-mount.c:1154 #: ../programs/gvfs-move.c:144 ../programs/gvfs-open.c:140 #: ../programs/gvfs-open.c:158 ../programs/gvfs-rename.c:82 -#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:181 +#: ../programs/gvfs-rm.c:72 ../programs/gvfs-save.c:182 #: ../programs/gvfs-set-attribute.c:151 ../programs/gvfs-trash.c:106 #: ../programs/gvfs-tree.c:263 #, c-format msgid "Try \"%s --help\" for more information." msgstr "Tente \"%s --help\" para mais informações." -#: ../daemon/mount.c:702 +#: ../daemon/mount.c:709 #, c-format msgid "Automount failed: %s" msgstr "Falha ao montar automaticamente: %s" -#: ../daemon/mount.c:746 ../daemon/mount.c:807 +#: ../daemon/mount.c:753 ../daemon/mount.c:814 msgid "The specified location is not mounted" msgstr "A localização especificada não está montada" -#: ../daemon/mount.c:751 +#: ../daemon/mount.c:758 msgid "The specified location is not supported" msgstr "A localização especificada não é suportada" -#: ../daemon/mount.c:875 +#: ../daemon/mount.c:882 msgid "Location is already mounted" msgstr "A localização já está montada" -#: ../daemon/mount.c:884 +#: ../daemon/mount.c:891 msgid "Location is not mountable" msgstr "A localização não é montável" @@ -2061,7 +2064,7 @@ msgid "Start Anyway" msgstr "Ainda assim iniciar" -#: ../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 "Uma ou mais aplicações estão a impedir a operação de desmontar." @@ -2444,7 +2447,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 "Ainda assim ejetar" @@ -2462,7 +2465,7 @@ "A escrever dados em %s\n" "Não desligue até terminar" -#: ../monitor/udisks2/gvfsudisks2utils.c:820 +#: ../monitor/udisks2/gvfsudisks2utils.c:821 #, c-format msgid "You can now unplug %s\n" msgstr "Já pode desligar %s\n" @@ -2610,7 +2613,7 @@ #: ../programs/gvfs-monitor-dir.c:134 ../programs/gvfs-monitor-file.c:132 #: ../programs/gvfs-mount.c:1152 ../programs/gvfs-move.c:142 #: ../programs/gvfs-open.c:138 ../programs/gvfs-rename.c:80 -#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:179 +#: ../programs/gvfs-rm.c:70 ../programs/gvfs-save.c:180 #: ../programs/gvfs-set-attribute.c:149 ../programs/gvfs-trash.c:104 #: ../programs/gvfs-tree.c:261 #, c-format @@ -2659,7 +2662,7 @@ msgstr "ORIGEM" #: ../programs/gvfs-copy.c:134 ../programs/gvfs-move.c:132 -#: ../programs/gvfs-save.c:168 +#: ../programs/gvfs-save.c:169 msgid "DEST" msgstr "DESTINO" @@ -3145,18 +3148,18 @@ msgid "Error reading stdin" msgstr "Erro ao ler stdin" -#: ../programs/gvfs-save.c:129 +#: ../programs/gvfs-save.c:130 #, c-format msgid "Error closing: %s\n" msgstr "Erro ao fechar: %s\n" #. Translators: The "etag" is a token allowing to verify whether a file has been modified -#: ../programs/gvfs-save.c:142 +#: ../programs/gvfs-save.c:143 #, c-format msgid "Etag not available\n" msgstr "Etag indisponível\n" -#: ../programs/gvfs-save.c:169 +#: ../programs/gvfs-save.c:170 msgid "Read from standard input and save to DEST." msgstr "Ler da entrada padrão e gravar no DESTINO."