diff options
| -rw-r--r-- | Makefile.in | 42 | ||||
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | aclocal.m4 | 66 | ||||
| -rwxr-xr-x | autogen.sh | 4 | ||||
| -rwxr-xr-x | compile | 2 | ||||
| -rwxr-xr-x | configure | 32 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.in | 23 | ||||
| -rw-r--r-- | data/appdata/Makefile.in | 22 | ||||
| -rw-r--r-- | data/icons/Makefile.in | 22 | ||||
| -rwxr-xr-x | depcomp | 2 | ||||
| -rw-r--r-- | help/Makefile.in | 22 | ||||
| -rwxr-xr-x | install-sh | 366 | ||||
| -rwxr-xr-x | missing | 2 | ||||
| -rw-r--r-- | po/af.po | 4 | ||||
| -rw-r--r-- | po/am.po | 4 | ||||
| -rw-r--r-- | po/ar.po | 4 | ||||
| -rw-r--r-- | po/ast.po | 4 | ||||
| -rw-r--r-- | po/az.po | 4 | ||||
| -rw-r--r-- | po/bg.po | 4 | ||||
| -rw-r--r-- | po/bo.po | 4 | ||||
| -rw-r--r-- | po/ca.po | 4 | ||||
| -rw-r--r-- | po/ca@valencia.po | 4 | ||||
| -rw-r--r-- | po/ce.po | 4 | ||||
| -rw-r--r-- | po/cs.po | 4 | ||||
| -rw-r--r-- | po/da.po | 4 | ||||
| -rw-r--r-- | po/de.po | 4 | ||||
| -rw-r--r-- | po/el.po | 4 | ||||
| -rw-r--r-- | po/en_GB.po | 4 | ||||
| -rw-r--r-- | po/eo.po | 4 | ||||
| -rw-r--r-- | po/es.po | 4 | ||||
| -rw-r--r-- | po/et.po | 4 | ||||
| -rw-r--r-- | po/eu.po | 4 | ||||
| -rw-r--r-- | po/fi.po | 4 | ||||
| -rw-r--r-- | po/fr.po | 4 | ||||
| -rw-r--r-- | po/gd.po | 4 | ||||
| -rw-r--r-- | po/gl.po | 4 | ||||
| -rw-r--r-- | po/he.po | 4 | ||||
| -rw-r--r-- | po/hr.po | 4 | ||||
| -rw-r--r-- | po/hu.po | 4 | ||||
| -rw-r--r-- | po/hy.po | 4 | ||||
| -rw-r--r-- | po/id.po | 4 | ||||
| -rw-r--r-- | po/it.po | 4 | ||||
| -rw-r--r-- | po/ja.po | 4 | ||||
| -rw-r--r-- | po/kk.po | 4 | ||||
| -rw-r--r-- | po/km.po | 4 | ||||
| -rw-r--r-- | po/ky.po | 4 | ||||
| -rw-r--r-- | po/lt.po | 4 | ||||
| -rw-r--r-- | po/lv.po | 4 | ||||
| -rw-r--r-- | po/mhr.po | 4 | ||||
| -rw-r--r-- | po/ms.po | 4 | ||||
| -rw-r--r-- | po/my.po | 4 | ||||
| -rw-r--r-- | po/nb.po | 4 | ||||
| -rw-r--r-- | po/nl.po | 4 | ||||
| -rw-r--r-- | po/oc.po | 4 | ||||
| -rw-r--r-- | po/pa.po | 4 | ||||
| -rw-r--r-- | po/pl.po | 4 | ||||
| -rw-r--r-- | po/pt.po | 4 | ||||
| -rw-r--r-- | po/pt_BR.po | 5 | ||||
| -rw-r--r-- | po/ro.po | 4 | ||||
| -rw-r--r-- | po/ru.po | 5 | ||||
| -rw-r--r-- | po/sd.po | 4 | ||||
| -rw-r--r-- | po/se.po | 4 | ||||
| -rw-r--r-- | po/shn.po | 4 | ||||
| -rw-r--r-- | po/sk.po | 27 | ||||
| -rw-r--r-- | po/sl.po | 4 | ||||
| -rw-r--r-- | po/sq.po | 4 | ||||
| -rw-r--r-- | po/sr.po | 4 | ||||
| -rw-r--r-- | po/sv.po | 4 | ||||
| -rw-r--r-- | po/ta.po | 4 | ||||
| -rw-r--r-- | po/te.po | 4 | ||||
| -rw-r--r-- | po/th.po | 4 | ||||
| -rw-r--r-- | po/tr.po | 4 | ||||
| -rw-r--r-- | po/ug.po | 4 | ||||
| -rw-r--r-- | po/uk.po | 4 | ||||
| -rw-r--r-- | po/ur.po | 4 | ||||
| -rw-r--r-- | po/uz.po | 4 | ||||
| -rw-r--r-- | po/vi.po | 4 | ||||
| -rw-r--r-- | po/zh_CN.po | 4 | ||||
| -rw-r--r-- | po/zh_TW.po | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 28 |
81 files changed, 491 insertions, 437 deletions
diff --git a/Makefile.in b/Makefile.in index 60b0593..f5de010 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,9 +86,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) COPYING NEWS \ - compile install-sh missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -86,6 +93,8 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -147,6 +156,8 @@ ETAGS = etags CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in COPYING NEWS compile \ + install-sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -349,7 +360,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -555,15 +565,15 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -599,17 +609,17 @@ distcheck: dist esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -784,6 +794,8 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags tags-am uninstall uninstall-am +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. @@ -1,3 +1,7 @@ +Overview of changes in simple-scan 3.17.4 + + * Updated translations + Overview of changes in simple-scan 3.17.3 * Stop using gnome-common, use autotools directly @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,7 +20,7 @@ You have another version of autoconf. It may work, but is not guaranteed to. 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'.])]) -# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -103,15 +103,14 @@ _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -142,7 +141,7 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -333,7 +332,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -409,7 +408,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -499,8 +498,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -574,6 +573,9 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. ]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not @@ -603,7 +605,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -614,7 +616,7 @@ echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_co # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -624,7 +626,7 @@ if test x"${install_sh}" != xset; then fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -646,7 +648,7 @@ AC_SUBST([am__leading_dot])]) # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -681,7 +683,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -731,7 +733,7 @@ rm -f confinc confmf # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -770,7 +772,7 @@ fi # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -799,7 +801,7 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -846,7 +848,7 @@ AC_LANG_POP([C])]) # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -865,7 +867,7 @@ AC_DEFUN([AM_RUN_LOG], # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -946,7 +948,7 @@ AC_CONFIG_COMMANDS_PRE( rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1006,7 +1008,7 @@ AC_SUBST([AM_BACKSLASH])dnl _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1034,7 +1036,7 @@ fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1053,7 +1055,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1186,7 +1188,7 @@ AC_SUBST([am__untar]) # Autoconf support for the Vala compiler -# Copyright (C) 2008-2013 Free Software Foundation, Inc. +# Copyright (C) 2008-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -21,12 +21,12 @@ set -x aclocal --install || exit 1 intltoolize --force --copy --automake || exit 1 autoreconf --verbose --force --install -Wno-portability || exit 1 -set +x +{ set +x; } 2>/dev/null if [ "$NOCONFIGURE" = "" ]; then set -x $srcdir/configure "$@" || exit 1 - set +x + { set +x; } 2>/dev/null if [ "$1" = "--help" ]; then exit 0 else echo "Now type \`make\' to compile $PKG_NAME" || exit 1 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for simple-scan 3.17.3. +# Generated by GNU Autoconf 2.69 for simple-scan 3.17.4. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -637,8 +637,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='simple-scan' PACKAGE_TARNAME='simple-scan' -PACKAGE_VERSION='3.17.3' -PACKAGE_STRING='simple-scan 3.17.3' +PACKAGE_VERSION='3.17.4' +PACKAGE_STRING='simple-scan 3.17.4' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1396,7 +1396,7 @@ if test "$ac_init_help" = "long"; then # 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 simple-scan 3.17.3 to adapt to many kinds of systems. +\`configure' configures simple-scan 3.17.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1462,7 +1462,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of simple-scan 3.17.3:";; + short | recursive ) echo "Configuration of simple-scan 3.17.4:";; esac cat <<\_ACEOF @@ -1578,7 +1578,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -simple-scan configure 3.17.3 +simple-scan configure 3.17.4 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1830,7 +1830,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by simple-scan $as_me 3.17.3, which was +It was created by simple-scan $as_me 3.17.4, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2178,7 +2178,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2379,8 +2379,8 @@ test "$program_suffix" != NONE && ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2399,7 +2399,7 @@ else $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2693,7 +2693,7 @@ fi # Define the identity of the package. PACKAGE='simple-scan' - VERSION='3.17.3' + VERSION='3.17.4' cat >>confdefs.h <<_ACEOF @@ -2727,8 +2727,8 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -6357,7 +6357,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by simple-scan $as_me 3.17.3, which was +This file was extended by simple-scan $as_me 3.17.4, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6414,7 +6414,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -simple-scan config.status 3.17.3 +simple-scan config.status 3.17.4 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index d3b5138..17074b7 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(simple-scan, 3.17.3) +AC_INIT(simple-scan, 3.17.4) AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz foreign]) AM_SILENT_RULES([yes]) AM_MAINTAINER_MODE diff --git a/data/Makefile.in b/data/Makefile.in index fa2c5b0..c997fbb 100644 --- a/data/Makefile.in +++ b/data/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,8 +87,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(dist_man1_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -86,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -176,6 +185,7 @@ am__define_uniq_tagged_files = \ ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(dist_man1_MANS) $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -356,7 +366,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -714,6 +723,8 @@ uninstall-man: uninstall-man1 tags-am uninstall uninstall-am uninstall-desktopDATA \ uninstall-man uninstall-man1 +.PRECIOUS: Makefile + @INTLTOOL_DESKTOP_RULE@ @INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ diff --git a/data/appdata/Makefile.in b/data/appdata/Makefile.in index 401dce1..b520fe1 100644 --- a/data/appdata/Makefile.in +++ b/data/appdata/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,7 +87,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/appdata -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -85,6 +94,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -137,6 +147,7 @@ am__uninstall_files_from_dir = { \ am__installdirs = "$(DESTDIR)$(appdatadir)" DATA = $(appdata_DATA) am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -283,7 +294,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/appdata/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/appdata/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -477,6 +487,8 @@ uninstall-am: uninstall-appdataDATA pdf-am ps ps-am tags-am uninstall uninstall-am \ uninstall-appdataDATA +.PRECIOUS: Makefile + @INTLTOOL_XML_RULE@ # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/data/icons/Makefile.in b/data/icons/Makefile.in index aac46e3..1cfa0ea 100644 --- a/data/icons/Makefile.in +++ b/data/icons/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,7 +86,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = data/icons -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -84,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -107,6 +117,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -255,7 +266,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign data/icons/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign data/icons/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -423,6 +433,8 @@ uninstall-am: uninstall-local maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am uninstall-local +.PRECIOUS: Makefile + install-data-local: for icon in $(icons); do \ @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # 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 diff --git a/help/Makefile.in b/help/Makefile.in index 2910469..8b1b21f 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,7 +14,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -76,7 +86,6 @@ NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : subdir = help -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -84,6 +93,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -107,6 +117,7 @@ am__can_run_installinfo = \ *) (install-info --version) >/dev/null 2>&1;; \ esac am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +am__DIST_COMMON = $(srcdir)/Makefile.in DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -270,7 +281,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign help/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign help/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -439,6 +449,8 @@ uninstall-am: maintainer-clean-generic mostlyclean mostlyclean-generic pdf \ pdf-am ps ps-am tags-am uninstall uninstall-am +.PRECIOUS: Makefile + @YELP_HELP_RULES@ # Tell versions [3.59,3.63) of GNU make to not export all variables. @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ scriptversion=2011-11-20.07; # UTC # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ mvprog=${MVPROG-mv} rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dir_arg= dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ while test $# -ne 0; do -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ if test $# -eq 0; then fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ if test -z "$dir_arg"; then *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ do # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ do if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ do # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue - - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + test X"$d" = X && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ do # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ do # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && - - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:31+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/po/ca@valencia.po b/po/ca@valencia.po index f3fb111..2983d2b 100644 --- a/po/ca@valencia.po +++ b/po/ca@valencia.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/po/en_GB.po b/po/en_GB.po index 33026da..7acb38f 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-07 05:15+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" "Language: eo\n" #. Button to submit authorization dialog @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/po/pt_BR.po b/po/pt_BR.po index 5b51a77..5ad6bb0 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -662,6 +662,7 @@ msgstr "" " Rafael Zenni https://launchpad.net/~rafaeldz\n" " Salomão Carneiro de Brito https://launchpad.net/~salomaocar\n" " Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt\n" +" Vinicius Almeida https://launchpad.net/~vinicius-algo\n" " Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n" " Vítor Avelino https://launchpad.net/~vitoravelino\n" " andbelo https://launchpad.net/~andbelo\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" "Language: ro\n" #. Button to submit authorization dialog @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -666,6 +666,7 @@ msgstr "" " Victor Mireyev https://launchpad.net/~victor-mireyev\n" " Vitaly Zawullon Katraev https://launchpad.net/~zawullon\n" " evilzipik https://launchpad.net/~evilzipik\n" +" ned https://launchpad.net/~i-nedoboy\n" " vasilisc https://launchpad.net/~vasilisc\n" " Илья Калитко https://launchpad.net/~kalitko-ilya007\n" " ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -8,14 +8,14 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" "POT-Creation-Date: 2015-04-15 12:17+1200\n" -"PO-Revision-Date: 2012-07-23 09:07+0000\n" -"Last-Translator: Robert Ancell <robert.ancell@canonical.com>\n" +"PO-Revision-Date: 2015-06-29 19:13+0000\n" +"Last-Translator: Laco Gubík <Unknown>\n" "Language-Team: Slovak <sk@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-30 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -35,17 +35,17 @@ msgstr "_Heslo:" #. Combo box label for scanning both sides of a page #: ../data/simple-scan.ui.h:8 msgid "Front and Back" -msgstr "" +msgstr "Predná a zadná strana" #. Combo box label for scanning the front side of a page #: ../data/simple-scan.ui.h:10 msgid "Front" -msgstr "" +msgstr "Predná strana" #. Combo box label for scanning the back side of a page #: ../data/simple-scan.ui.h:12 msgid "Back" -msgstr "" +msgstr "Zadná strana" #. Title of scan window #: ../data/simple-scan.ui.h:14 ../data/simple-scan.desktop.in.h:1 @@ -60,7 +60,7 @@ msgstr "_Dokument" #. Scan menu item #: ../data/simple-scan.ui.h:18 msgid "Sc_an" -msgstr "" +msgstr "_Skenovať" #. Toolbar scan menu item to scan a single page from the scanner #: ../data/simple-scan.ui.h:20 @@ -94,7 +94,7 @@ msgstr "" #. Label on email menu item #: ../data/simple-scan.ui.h:30 msgid "_Email" -msgstr "" +msgstr "_Email" #. Page menu (contains action for each page, e.g. delete, crop) #: ../data/simple-scan.ui.h:32 @@ -149,7 +149,7 @@ msgstr "Le_gal" #. Radio button for cropping page to 4x6 inch #: ../data/simple-scan.ui.h:52 msgid "4×6" -msgstr "" +msgstr "4×6" #. Radio button for cropping to custom page size #: ../data/simple-scan.ui.h:54 @@ -164,12 +164,12 @@ msgstr "_Otočiť výrez" #. Menu item to move the selected page to the left #: ../data/simple-scan.ui.h:58 msgid "Move Left" -msgstr "" +msgstr "Presunúť doľava" #. Menu item to move the selected page to the right #: ../data/simple-scan.ui.h:60 msgid "Move Right" -msgstr "" +msgstr "Presunúť doprava" #. Label on help menu #: ../data/simple-scan.ui.h:62 @@ -179,7 +179,7 @@ msgstr "_Pomocník" #. Help|Contents menu #: ../data/simple-scan.ui.h:64 msgid "_Contents" -msgstr "" +msgstr "_Obsah" #. Tooltip for new document button #: ../data/simple-scan.ui.h:66 @@ -640,6 +640,7 @@ msgstr "" "Launchpad Contributions:\n" " 6205 https://launchpad.net/~6205-reactivated-deactivatedaccount\n" " Alessio Treglia https://launchpad.net/~quadrispro\n" +" Eduard Hummel https://launchpad.net/~eduardhummel\n" " Laco Gubík https://launchpad.net/~laco\n" " Pavol Klačanský https://launchpad.net/~pavolzetor-deactivatedaccount\n" " Prescott_SK https://launchpad.net/~prescott66\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -13,8 +13,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" "Language: sr\n" #. Button to submit authorization dialog @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -15,8 +15,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" "X-Poedit-Language: Uighur\n" "X-Poedit-SourceCharset: utf-8\n" @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/po/zh_CN.po b/po/zh_CN.po index 360d4f6..39fd556 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/po/zh_TW.po b/po/zh_TW.po index ff3d95f..8bd8ad3 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -14,8 +14,8 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2015-06-05 05:32+0000\n" -"X-Generator: Launchpad (build 17540)\n" +"X-Launchpad-Export-Date: 2015-06-29 05:21+0000\n" +"X-Generator: Launchpad (build 17578)\n" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:2 diff --git a/src/Makefile.in b/src/Makefile.in index 587b9b4..c47e058 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,10 +89,6 @@ POST_UNINSTALL = : bin_PROGRAMS = simple-scan$(EXEEXT) @HAVE_COLORD_TRUE@am__append_1 = -D HAVE_COLORD subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am book.c \ - book-view.c page.c page-view.c simple-scan.c scanner.c ui.c \ - autosave-manager.c $(top_srcdir)/depcomp \ - $(srcdir)/simple_scan_vala.stamp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/m4/nls.m4 \ @@ -90,6 +96,7 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/gsettings.m4 \ $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(install_sh) -d CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = @@ -170,6 +177,10 @@ am__define_uniq_tagged_files = \ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in \ + $(srcdir)/simple_scan_vala.stamp $(top_srcdir)/depcomp \ + autosave-manager.c book-view.c book.c page-view.c page.c \ + scanner.c simple-scan.c ui.c DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -355,7 +366,6 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --foreign src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -843,6 +853,8 @@ uninstall-am: uninstall-binPROGRAMS ps ps-am tags tags-am uninstall uninstall-am \ uninstall-binPROGRAMS +.PRECIOUS: Makefile + resources.c: $(top_srcdir)/data/simple-scan.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(top_srcdir)/data/ $(top_srcdir)/data/simple-scan.gresource.xml) $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data/ --generate-source $< |