From fafc0daa6bd26ad254943315f253b1b218e71080 Mon Sep 17 00:00:00 2001 From: Alessio Treglia Date: Tue, 26 Oct 2010 17:12:56 +0200 Subject: Imported Upstream version 2.32.0.1 --- NEWS | 7 + aclocal.m4 | 2860 ++++++++++++++++---------------- configure | 34 +- configure.ac | 2 +- help/Makefile.am | 24 + help/Makefile.in | 25 +- help/POT/POT.po | 228 +++ help/POT/adf.page | 17 + help/POT/crop.page | 23 + help/POT/dpi.page | 14 + help/POT/email.page | 20 + help/POT/index.page | 25 + help/POT/legal.xml | 9 + help/POT/print.page | 13 + help/POT/reorder.page | 16 + help/POT/rotate.page | 14 + help/POT/save.page | 31 + help/POT/scanner.page | 18 + help/POT/scanning.page | 49 + help/de/adf.page | 17 + help/de/crop.page | 23 + help/de/de.po | 449 +++++ help/de/dpi.page | 14 + help/de/email.page | 20 + help/de/index.page | 25 + help/de/legal.xml | 9 + help/de/print.page | 13 + help/de/reorder.page | 16 + help/de/rotate.page | 14 + help/de/save.page | 31 + help/de/scanner.page | 18 + help/de/scanning.page | 49 + help/po.stamp | 0 help/translations/de.po | 449 +++++ help/translations/simple-scan-help.pot | 228 +++ po/af.po | 2 +- po/ar.po | 2 +- po/ast.po | 2 +- po/bg.po | 8 +- po/ca.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_GB.po | 2 +- po/es.po | 3 +- po/eu.po | 2 +- po/fi.po | 2 +- po/fr.po | 4 +- po/gl.po | 10 +- po/he.po | 2 +- po/hr.po | 2 +- po/hu.po | 2 +- po/it.po | 2 +- po/ja.po | 2 +- po/lt.po | 2 +- po/ms.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/pl.po | 2 +- po/pt.po | 91 +- po/pt_BR.po | 3 +- po/ro.po | 2 +- po/ru.po | 12 +- po/sk.po | 2 +- po/sl.po | 2 +- po/sr.po | 2 +- po/sv.po | 2 +- po/te.po | 2 +- po/tr.po | 2 +- po/uk.po | 2 +- po/vi.po | 2 +- po/zh_CN.po | 2 +- src/book.c | 13 +- src/page-view.c | 12 +- src/page.c | 10 +- src/scanner.c | 4 +- 77 files changed, 3472 insertions(+), 1564 deletions(-) create mode 100644 help/POT/POT.po create mode 100644 help/POT/adf.page create mode 100644 help/POT/crop.page create mode 100644 help/POT/dpi.page create mode 100644 help/POT/email.page create mode 100644 help/POT/index.page create mode 100644 help/POT/legal.xml create mode 100644 help/POT/print.page create mode 100644 help/POT/reorder.page create mode 100644 help/POT/rotate.page create mode 100644 help/POT/save.page create mode 100644 help/POT/scanner.page create mode 100644 help/POT/scanning.page create mode 100644 help/de/adf.page create mode 100644 help/de/crop.page create mode 100644 help/de/de.po create mode 100644 help/de/dpi.page create mode 100644 help/de/email.page create mode 100644 help/de/index.page create mode 100644 help/de/legal.xml create mode 100644 help/de/print.page create mode 100644 help/de/reorder.page create mode 100644 help/de/rotate.page create mode 100644 help/de/save.page create mode 100644 help/de/scanner.page create mode 100644 help/de/scanning.page create mode 100644 help/po.stamp create mode 100644 help/translations/de.po create mode 100644 help/translations/simple-scan-help.pot diff --git a/NEWS b/NEWS index c484fa1..d969d79 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,10 @@ +Overview of changes in simple-scan 2.32.0.1 + + * Fix crash when pages not scanned top to bottom + * Fix PDF output in locales that use ',' for a decimal point + * Handle grayscale mode in brother3 driver + * Fix wrong size crop when saving + Overview of changes in simple-scan 2.32.0 * Updated translations diff --git a/aclocal.m4 b/aclocal.m4 index 003f20b..b07ffd9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -19,1028 +19,498 @@ 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, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl AM_GCONF_SOURCE_2 +dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas +dnl (i.e. pass to gconftool-2 +dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where +dnl you should install foo.schemas files +dnl -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# 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.11' -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.11.1], [], - [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl -]) +AC_DEFUN([AM_GCONF_SOURCE_2], +[ + if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then + GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` + else + GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE + fi -# _AM_AUTOCONF_VERSION(VERSION) -# ----------------------------- -# aclocal traces this macro to find the Autoconf version. -# This is a private macro too. Using m4_define simplifies -# the logic in aclocal, which can simply ignore this definition. -m4_define([_AM_AUTOCONF_VERSION], []) + AC_ARG_WITH([gconf-source], + AC_HELP_STRING([--with-gconf-source=sourceaddress], + [Config database for installing schema files.]), + [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) -# AM_SET_CURRENT_AUTOMAKE_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.11.1])dnl -m4_ifndef([AC_AUTOCONF_VERSION], - [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) + AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) -# AM_AUX_DIR_EXPAND -*- Autoconf -*- + if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then + GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' + fi -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_ARG_WITH([gconf-schema-file-dir], + AC_HELP_STRING([--with-gconf-schema-file-dir=dir], + [Directory for installing schema files.]), + [GCONF_SCHEMA_FILE_DIR="$withval"],) -# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. -# -# Of course, Automake must honor this variable whenever it calls a -# tool from the auxiliary directory. The problem is that $srcdir (and -# therefore $ac_aux_dir as well) can be either absolute or relative, -# depending on how configure is run. This is pretty annoying, since -# it makes $ac_aux_dir quite unusable in subdirectories: in the top -# source directory, any form will work fine, but in subdirectories a -# relative path needs to be adjusted first. -# -# $ac_aux_dir/missing -# fails when called from a subdirectory if $ac_aux_dir is relative -# $top_srcdir/$ac_aux_dir/missing -# fails if $ac_aux_dir is absolute, -# fails when called from a subdirectory in a VPATH build with -# a relative $ac_aux_dir -# -# The reason of the latter failure is that $top_srcdir and $ac_aux_dir -# are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you -# start a VPATH build or use an absolute $srcdir. -# -# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, -# iff we strip the leading $srcdir from $ac_aux_dir. That would be: -# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` -# and then we would define $MISSING as -# MISSING="\${SHELL} $am_aux_dir/missing" -# This will work as long as MISSING is not called from configure, because -# unfortunately $(top_srcdir) has no meaning in configure. -# However there are other variables, like CC, which are often used in -# configure, and could therefore not use this "fixed" $ac_aux_dir. -# -# Another solution, used here, is to always expand $ac_aux_dir to an -# absolute PATH. The drawback is that using absolute paths prevent a -# configured tree to be moved without reconfiguration. + AC_SUBST(GCONF_SCHEMA_FILE_DIR) + AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) -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_ARG_ENABLE(schemas-install, + AC_HELP_STRING([--disable-schemas-install], + [Disable the schemas installation]), + [case ${enableval} in + yes|no) ;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; + esac]) + AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) ]) +# gnome-common.m4 +# -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl GNOME_COMMON_INIT -# serial 4 +AC_DEFUN([GNOME_COMMON_INIT], +[ + dnl this macro should come after AC_CONFIG_MACRO_DIR + AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) -# This was merged into AC_PROG_CC in Autoconf. + dnl ensure that when the Automake generated makefile calls aclocal, + dnl it honours the $ACLOCAL_FLAGS environment variable + ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" + if test -n "$ac_macro_dir"; then + ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" + fi -AU_DEFUN([AM_PROG_CC_STDC], -[AC_PROG_CC -AC_DIAGNOSE([obsolete], [$0: - your code should no longer depend upon `am_cv_prog_cc_stdc', but upon - `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when - you adjust the code. You can also remove the above call to - AC_PROG_CC if you already called it elsewhere.]) -am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc + AC_SUBST([ACLOCAL_AMFLAGS]) ]) -AU_DEFUN([fp_PROG_CC_STDC]) - -# AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_DEFUN([GNOME_DEBUG_CHECK], +[ + AC_ARG_ENABLE([debug], + AC_HELP_STRING([--enable-debug], + [turn on debugging]),, + [enable_debug=no]) -# serial 9 + if test x$enable_debug = xyes ; then + AC_DEFINE(GNOME_ENABLE_DEBUG, 1, + [Enable additional debugging at the expense of performance and size]) + fi +]) -# AM_CONDITIONAL(NAME, SHELL-CONDITION) -# ------------------------------------- -# Define a conditional. -AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -AC_SUBST([$1_TRUE])dnl -AC_SUBST([$1_FALSE])dnl -_AM_SUBST_NOTMAKE([$1_TRUE])dnl -_AM_SUBST_NOTMAKE([$1_FALSE])dnl -m4_define([_AM_COND_VALUE_$1], [$2])dnl -if $2; then - $1_TRUE= - $1_FALSE='#' -else - $1_TRUE='#' - $1_FALSE= -fi -AC_CONFIG_COMMANDS_PRE( -[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then - AC_MSG_ERROR([[conditional "$1" was never defined. -Usually this means the macro was only invoked conditionally.]]) -fi])]) +dnl GNOME_MAINTAINER_MODE_DEFINES () +dnl define DISABLE_DEPRECATED +dnl +AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], +[ + AC_REQUIRE([AM_MAINTAINER_MODE]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + DISABLE_DEPRECATED="" + if test $USE_MAINTAINER_MODE = yes; then + DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" + for DOMAIN in $DOMAINS; do + DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" + done + fi -# serial 10 + AC_SUBST(DISABLE_DEPRECATED) +]) -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be -# written in clear, in which case automake, when reading aclocal.m4, -# will think it sees a *use*, and therefore will trigger all it's -# C support machinery. Also note that it means that autoscan, seeing -# CC etc. in the Makefile, will ask for an AC_PROG_CC use... +dnl GNOME_COMPILE_WARNINGS +dnl Turn on many useful compiler warnings +dnl For now, only works on GCC +AC_DEFUN([GNOME_COMPILE_WARNINGS],[ + dnl ****************************** + dnl More compiler warnings + dnl ****************************** + AC_ARG_ENABLE(compile-warnings, + AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], + [Turn on compiler warnings]),, + [enable_compile_warnings="m4_default([$1],[yes])"]) -# _AM_DEPENDENCIES(NAME) -# ---------------------- -# See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". -# We try a few techniques and use that to set a single cache variable. -# -# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was -# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular -# dependency, and given that the user is not expected to run this macro, -# just rely on AC_PROG_CC. -AC_DEFUN([_AM_DEPENDENCIES], -[AC_REQUIRE([AM_SET_DEPDIR])dnl -AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl -AC_REQUIRE([AM_MAKE_INCLUDE])dnl -AC_REQUIRE([AM_DEP_TRACK])dnl + warnCFLAGS= + if test "x$GCC" != xyes; then + enable_compile_warnings=no + fi -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) + warning_flags= + realsave_CFLAGS="$CFLAGS" -AC_CACHE_CHECK([dependency style of $depcc], - [am_cv_$1_dependencies_compiler_type], -[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then - # We make a subdir and do the tests there. Otherwise we can end up - # making bogus files that we don't know about and never remove. For - # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. - mkdir conftest.dir - # Copy depcomp to subdir because otherwise we won't find it if we're - # using a relative directory. - cp "$am_depcomp" conftest.dir - cd conftest.dir - # We will build objects and dependencies in a subdirectory because - # it helps to detect inapplicable dependency modes. For instance - # both Tru64's cc and ICC support -MD to output dependencies as a - # side effect of compilation, but ICC will put the dependencies in - # the current directory while Tru64 will put them in the object - # directory. - mkdir sub - - am_cv_$1_dependencies_compiler_type=none - if test "$am_compiler_list" = ""; then - am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` - fi - am__universal=false - m4_case([$1], [CC], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac], - [CXX], - [case " $depcc " in #( - *\ -arch\ *\ -arch\ *) am__universal=true ;; - esac]) - - for depmode in $am_compiler_list; do - # Setup a source with many dependencies, because some compilers - # like to wrap large dependency lists on column 80 (with \), and - # we should not choose a depcomp mode which is confused by this. - # - # We need to recreate these files for each test, as the compiler may - # overwrite some of them when testing with obscure command lines. - # This happens at least with the AIX C compiler. - : > sub/conftest.c - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - - # We check with `-c' and `-o' for the sake of the "dashmstdout" - # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs - am__obj=sub/conftest.${OBJEXT-o} - am__minus_obj="-o $am__obj" - case $depmode in - gcc) - # This depmode causes a compiler race in universal mode. - test "$am__universal" = false || continue - ;; - nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested - if test "x$enable_dependency_tracking" = xyes; then - continue - else - break - fi - ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has - # not run yet. These depmodes are late enough in the game, and - # so weak that their functioning should not be impacted. - am__obj=conftest.${OBJEXT-o} - am__minus_obj= - ;; - none) break ;; - esac - if depmode=$depmode \ - source=sub/conftest.c object=$am__obj \ - depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ - $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ - >/dev/null 2>conftest.err && - grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && - grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && - grep $am__obj sub/conftest.Po > /dev/null 2>&1 && - ${MAKE-make} -s -f confmf > /dev/null 2>&1; then - # icc doesn't choke on unknown options, it will just issue warnings - # or remarks (even with -Werror). So we grep stderr for any message - # that says an option was ignored or not supported. - # When given -MP, icc 7.0 and 7.1 complain thusly: - # icc: Command line warning: ignoring option '-M'; no argument required - # The diagnosis changed in icc 8.0: - # icc: Command line remark: option '-MP' not supported - if (grep 'ignoring option' conftest.err || - grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else - am_cv_$1_dependencies_compiler_type=$depmode - break - fi - fi - done - - cd .. - rm -rf conftest.dir -else - am_cv_$1_dependencies_compiler_type=none -fi -]) -AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) -AM_CONDITIONAL([am__fastdep$1], [ - test "x$enable_dependency_tracking" != xno \ - && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) -]) - - -# AM_SET_DEPDIR -# ------------- -# Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES -AC_DEFUN([AM_SET_DEPDIR], -[AC_REQUIRE([AM_SET_LEADING_DOT])dnl -AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl -]) - - -# AM_DEP_TRACK -# ------------ -AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) -if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -fi -AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) -AC_SUBST([AMDEPBACKSLASH])dnl -_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl -]) - -# Generate code to set up dependency tracking. -*- Autoconf -*- - -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -#serial 5 - -# _AM_OUTPUT_DEPENDENCY_COMMANDS -# ------------------------------ -AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], -[{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files - # are listed without --file. Let's play safe and only enable the eval - # if we detect the quoting. - case $CONFIG_FILES in - *\'*) eval set x "$CONFIG_FILES" ;; - *) set x $CONFIG_FILES ;; - esac - shift - for mf - do - # Strip MF so we end up with the name of the file. - mf=`echo "$mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but - # some people rename them; so instead we look at the file content. - # Grep'ing the first line is not enough: some people post-process - # each Makefile.in and add a new line on top of each file to say so. - # Grep'ing the whole file is not good either: AIX grep has a line - # limit of 2048, but all sed's we know have understand at least 4000. - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then - dirpart=`AS_DIRNAME("$mf")` - else - continue - fi - # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` - test -z "$DEPDIR" && continue - am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` - # Find all dependency output files, they are included files with - # $(DEPDIR) in their names. We invoke sed twice because it is the - # simplest approach to changing $(DEPDIR) to its actual value in the - # expansion. - for file in `sed -n " - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do - # Make sure the directory exists. - test -f "$dirpart/$file" && continue - fdir=`AS_DIRNAME(["$file"])` - AS_MKDIR_P([$dirpart/$fdir]) - # echo "creating $dirpart/$file" - echo '# dummy' > "$dirpart/$file" - done - done -} -])# _AM_OUTPUT_DEPENDENCY_COMMANDS - - -# AM_OUTPUT_DEPENDENCY_COMMANDS -# ----------------------------- -# This macro should only be invoked once -- use via AC_REQUIRE. -# -# This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will -# need in order to bootstrap the dependency handling code. -AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], -[AC_CONFIG_COMMANDS([depfiles], - [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) -]) - -# Do all the work for Automake. -*- Autoconf -*- - -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 16 - -# This macro actually does too much. Some checks are only needed if -# your package does certain things. But this isn't really a big deal. - -# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -# AM_INIT_AUTOMAKE([OPTIONS]) -# ----------------------------------------------- -# The call with PACKAGE and VERSION arguments is the old style -# call (pre autoconf-2.50), which is being phased out. PACKAGE -# and VERSION should now be passed to AC_INIT and removed from -# the call to AM_INIT_AUTOMAKE. -# We support both call styles for the transition. After -# the next Automake release, Autoconf can make the AC_INIT -# arguments mandatory, and then we can depend on a new Autoconf -# release and drop the old call support. -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl -dnl Autoconf wants to disallow AM_ names. We explicitly allow -dnl the ones we care about. -m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL])dnl -if test "`cd $srcdir && pwd`" != "`pwd`"; then - # Use -I$(srcdir) only when $(srcdir) != ., so that make's output - # is not polluted with repeated "-I." - AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl - # test to see if srcdir already configured - if test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) - fi -fi - -# test whether we have cygpath -if test -z "$CYGPATH_W"; then - if (cygpath --version) >/dev/null 2>/dev/null; then - CYGPATH_W='cygpath -w' - else - CYGPATH_W=echo - fi -fi -AC_SUBST([CYGPATH_W]) - -# Define the identity of the package. -dnl Distinguish between old-style and new-style calls. -m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl - AC_SUBST([PACKAGE], [$1])dnl - AC_SUBST([VERSION], [$2])], -[_AM_SET_OPTIONS([$1])dnl -dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, - [m4_fatal([AC_INIT should be called with package and version arguments])])dnl - AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl - AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - -_AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - -# Some tools Automake needs. -AC_REQUIRE([AM_SANITY_CHECK])dnl -AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) -AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl -# We need awk for the "check" target. 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 -_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], - [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], - [_AM_PROG_TAR([v7])])]) -_AM_IF_OPTION([no-dependencies],, -[AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl -]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. -AC_CONFIG_COMMANDS_PRE(dnl -[m4_provide_if([_AM_COMPILER_EXEEXT], - [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) - -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not -dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further -dnl mangled by Autoconf and run in a shell conditional statement. -m4_define([_AC_COMPILER_EXEEXT], -m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - - -# When config.status generates a header, we must update the stamp-h file. -# This file resides in the same directory as the config header -# that is generated. The stamp files are numbered to have different names. - -# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -# loop where config.status creates the headers, so we can generate -# our stamp files there. -AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -[# Compute $1's index in $config_headers. -_am_arg=$1 -_am_stamp_count=1 -for _am_header in $config_headers :; do - case $_am_header in - $_am_arg | $_am_arg:* ) - break ;; - * ) - _am_stamp_count=`expr $_am_stamp_count + 1` ;; - esac -done -echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_INSTALL_SH -# ------------------ -# Define $install_sh. -AC_DEFUN([AM_PROG_INSTALL_SH], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; - *) - install_sh="\${SHELL} $am_aux_dir/install-sh" - esac -fi -AC_SUBST(install_sh)]) - -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 - -# Check whether the underlying file-system supports filenames -# with a leading dot. For instance MS-DOS doesn't. -AC_DEFUN([AM_SET_LEADING_DOT], -[rm -rf .tst 2>/dev/null -mkdir .tst 2>/dev/null -if test -d .tst; then - am__leading_dot=. -else - am__leading_dot=_ -fi -rmdir .tst 2>/dev/null -AC_SUBST([am__leading_dot])]) - -# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- -# From Jim Meyering - -# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 5 - -# AM_MAINTAINER_MODE([DEFAULT-MODE]) -# ---------------------------------- -# Control maintainer-specific portions of Makefiles. -# Default is to disable them, unless `enable' is passed literally. -# For symmetry, `disable' may be passed as well. Anyway, the user -# can override the default with the --enable/--disable switch. -AC_DEFUN([AM_MAINTAINER_MODE], -[m4_case(m4_default([$1], [disable]), - [enable], [m4_define([am_maintainer_other], [disable])], - [disable], [m4_define([am_maintainer_other], [enable])], - [m4_define([am_maintainer_other], [enable]) - m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) -AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) - dnl maintainer-mode's default is 'disable' unless 'enable' is passed - AC_ARG_ENABLE([maintainer-mode], -[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful - (and sometimes confusing) to the casual installer], - [USE_MAINTAINER_MODE=$enableval], - [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) - AC_MSG_RESULT([$USE_MAINTAINER_MODE]) - AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) - MAINT=$MAINTAINER_MODE_TRUE - AC_SUBST([MAINT])dnl -] -) - -AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - -# Check to see how 'make' treats includes. -*- Autoconf -*- - -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 4 - -# AM_MAKE_INCLUDE() -# ----------------- -# Check to see how make treats includes. -AC_DEFUN([AM_MAKE_INCLUDE], -[am_make=${MAKE-make} -cat > confinc << 'END' -am__doit: - @echo this is the am__doit target -.PHONY: am__doit -END -# If we don't find an include directive, just comment out the code. -AC_MSG_CHECKING([for style of include used by $am_make]) -am__include="#" -am__quote= -_am_result=none -# First try GNU make style include. -echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. -case `$am_make -s -f confmf 2> /dev/null` in #( -*the\ am__doit\ target*) - am__include=include - am__quote= - _am_result=GNU - ;; -esac -# Now try BSD make style include. -if test "$am__include" = "#"; then - echo '.include "confinc"' > confmf - case `$am_make -s -f confmf 2> /dev/null` in #( - *the\ am__doit\ target*) - am__include=.include - am__quote="\"" - _am_result=BSD - ;; - esac -fi -AC_SUBST([am__include]) -AC_SUBST([am__quote]) -AC_MSG_RESULT([$_am_result]) -rm -f confinc confmf -]) - -# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + case "$enable_compile_warnings" in + no) + warning_flags= + ;; + minimum) + warning_flags="-Wall" + ;; + yes) + warning_flags="-Wall -Wmissing-prototypes" + ;; + maximum|error) + warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" + CFLAGS="$warning_flags $CFLAGS" + for option in -Wno-sign-compare; do + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $option" + AC_MSG_CHECKING([whether gcc understands $option]) + AC_TRY_COMPILE([], [], + has_option=yes, + has_option=no,) + CFLAGS="$SAVE_CFLAGS" + AC_MSG_RESULT($has_option) + if test $has_option = yes; then + warning_flags="$warning_flags $option" + fi + unset has_option + unset SAVE_CFLAGS + done + unset option + if test "$enable_compile_warnings" = "error" ; then + warning_flags="$warning_flags -Werror" + fi + ;; + *) + AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) + ;; + esac + CFLAGS="$realsave_CFLAGS" + AC_MSG_CHECKING(what warning flags to pass to the C compiler) + AC_MSG_RESULT($warning_flags) -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_ARG_ENABLE(iso-c, + AC_HELP_STRING([--enable-iso-c], + [Try to warn if code is not ISO C ]),, + [enable_iso_c=no]) -# serial 6 + AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) + complCFLAGS= + if test "x$enable_iso_c" != "xno"; then + if test "x$GCC" = "xyes"; then + case " $CFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -ansi" ;; + esac + case " $CFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCFLAGS="$complCFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCFLAGS) -# AM_MISSING_PROG(NAME, PROGRAM) -# ------------------------------ -AC_DEFUN([AM_MISSING_PROG], -[AC_REQUIRE([AM_MISSING_HAS_RUN]) -$1=${$1-"${am_missing_run}$2"} -AC_SUBST($1)]) + WARN_CFLAGS="$warning_flags $complCFLAGS" + AC_SUBST(WARN_CFLAGS) +]) +dnl For C++, do basically the same thing. -# AM_MISSING_HAS_RUN -# ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. -AC_DEFUN([AM_MISSING_HAS_RUN], -[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([missing])dnl -if test x"${MISSING+set}" != xset; then - case $am_aux_dir in - *\ * | *\ *) - MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; - *) - MISSING="\${SHELL} $am_aux_dir/missing" ;; - esac -fi -# Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " -else - am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) -fi -]) +AC_DEFUN([GNOME_CXX_WARNINGS],[ + AC_ARG_ENABLE(cxx-warnings, + AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] + [Turn on compiler warnings.]),, + [enable_cxx_warnings="m4_default([$1],[minimum])"]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) + warnCXXFLAGS= + if test "x$GXX" != xyes; then + enable_cxx_warnings=no + fi + if test "x$enable_cxx_warnings" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-Wall[\ \ ]*) ;; + *) warnCXXFLAGS="-Wall -Wno-unused" ;; + esac -# AM_PROG_MKDIR_P -# --------------- -# Check for `mkdir -p'. -AC_DEFUN([AM_PROG_MKDIR_P], -[AC_PREREQ([2.60])dnl -AC_REQUIRE([AC_PROG_MKDIR_P])dnl -dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, -dnl while keeping a definition of mkdir_p for backward compatibility. -dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. -dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of -dnl Makefile.ins that do not define MKDIR_P, so we do our own -dnl adjustment using top_builddir (which is defined more often than -dnl MKDIR_P). -AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl -case $mkdir_p in - [[\\/$]]* | ?:[[\\/]]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac -]) + ## -W is not all that useful. And it cannot be controlled + ## with individual -Wno-xxx flags, unlike -Wall + if test "x$enable_cxx_warnings" = "xyes"; then + warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" + fi + fi + fi + AC_MSG_RESULT($warnCXXFLAGS) -# Helper functions for option handling. -*- Autoconf -*- + AC_ARG_ENABLE(iso-cxx, + AC_HELP_STRING([--enable-iso-cxx], + [Try to warn if code is not ISO C++ ]),, + [enable_iso_cxx=no]) -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. + AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) + complCXXFLAGS= + if test "x$enable_iso_cxx" != "xno"; then + if test "x$GXX" = "xyes"; then + case " $CXXFLAGS " in + *[\ \ ]-ansi[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; + esac -# serial 4 + case " $CXXFLAGS " in + *[\ \ ]-pedantic[\ \ ]*) ;; + *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; + esac + fi + fi + AC_MSG_RESULT($complCXXFLAGS) -# _AM_MANGLE_OPTION(NAME) -# ----------------------- -AC_DEFUN([_AM_MANGLE_OPTION], -[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" + AC_SUBST(WARN_CXXFLAGS) +]) -# _AM_SET_OPTION(NAME) -# ------------------------------ -# Set option NAME. Presently that only means defining a flag for this option. -AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +dnl Do not call GNOME_DOC_DEFINES directly. It is split out from +dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. +AC_DEFUN([GNOME_DOC_DEFINES], +[ +AC_ARG_WITH([help-dir], + AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, + [with_help_dir='${datadir}/gnome/help']) +HELP_DIR="$with_help_dir" +AC_SUBST(HELP_DIR) -# _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- -# OPTIONS is a space-separated list of Automake options. -AC_DEFUN([_AM_SET_OPTIONS], -[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) +AC_ARG_WITH([omf-dir], + AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, + [with_omf_dir='${datadir}/omf']) +OMF_DIR="$with_omf_dir" +AC_SUBST(OMF_DIR) -# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -# ------------------------------------------- -# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -AC_DEFUN([_AM_IF_OPTION], -[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +AC_ARG_WITH([help-formats], + AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, + [with_help_formats='']) +DOC_USER_FORMATS="$with_help_formats" +AC_SUBST(DOC_USER_FORMATS) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +AC_ARG_ENABLE([scrollkeeper], + [AC_HELP_STRING([--disable-scrollkeeper], + [do not make updates to the scrollkeeper database])],, + enable_scrollkeeper=yes) +AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl disable scrollkeeper automatically for distcheck +DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" +AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) -# serial 5 +AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) +]) -# AM_SANITY_CHECK -# --------------- -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file -# Reject unsafe characters in $srcdir or the absolute working directory -# name. Accept space and tab only in the latter. -am_lf=' -' -case `pwd` in - *[[\\\"\#\$\&\'\`$am_lf]]*) - AC_MSG_ERROR([unsafe absolute working directory name]);; -esac -case $srcdir in - *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; -esac +# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# +AC_DEFUN([GNOME_DOC_INIT], +[AC_REQUIRE([AC_PROG_LN_S])dnl -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then +ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi +AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) +PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], + [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) - test "$[2]" = conftest.file - ) -then - # Ok. - : +if test "$gdu_cv_have_gdu" = "yes"; then + AC_MSG_RESULT([yes]) + ifelse([$2],,[:],[$2]) else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) + AC_MSG_RESULT([no]) + ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) fi -AC_MSG_RESULT(yes)]) -# Copyright (C) 2009 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +GNOME_DOC_DEFINES +]) -# serial 1 -# AM_SILENT_RULES([DEFAULT]) -# -------------------------- -# Enable less verbose build rules; with the default set to DEFAULT -# (`yes' being less verbose, `no' or empty being verbose). -AC_DEFUN([AM_SILENT_RULES], -[AC_ARG_ENABLE([silent-rules], -[ --enable-silent-rules less verbose build output (undo: `make V=1') - --disable-silent-rules verbose build output (undo: `make V=0')]) -case $enable_silent_rules in -yes) AM_DEFAULT_VERBOSITY=0;; -no) AM_DEFAULT_VERBOSITY=1;; -*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) +# serial 40 IT_PROG_INTLTOOL +AC_DEFUN([IT_PROG_INTLTOOL], [ +AC_PREREQ([2.50])dnl +AC_REQUIRE([AM_NLS])dnl + +case "$am__api_version" in + 1.[01234]) + AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) + ;; + *) + ;; esac -AC_SUBST([AM_DEFAULT_VERBOSITY])dnl -AM_BACKSLASH='\' -AC_SUBST([AM_BACKSLASH])dnl -_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl -]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +if test -n "$1"; then + AC_MSG_CHECKING([for intltool >= $1]) -# AM_PROG_INSTALL_STRIP -# --------------------- -# One issue with vendor `install' (even GNU) is that you can't -# specify the program used to strip binaries. This is especially -# annoying in cross-compiling environments, where the build's strip -# is unlikely to handle the host's binaries. -# Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize -# STRIPPROG with the value of the STRIP variable (set by the user). -AC_DEFUN([AM_PROG_INSTALL_STRIP], -[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right -# tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -if test "$cross_compiling" != no; then - AC_CHECK_TOOL([STRIP], [strip], :) + INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` + [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` + ] + AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || + AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) fi -INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" -AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 2 +AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) +AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) +AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then + AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) +fi -# _AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. -# This macro is traced by Automake. -AC_DEFUN([_AM_SUBST_NOTMAKE]) + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -# AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- -# Public sister of _AM_SUBST_NOTMAKE. -AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) +_IT_SUBST(INTLTOOL_DESKTOP_RULE) +_IT_SUBST(INTLTOOL_DIRECTORY_RULE) +_IT_SUBST(INTLTOOL_KEYS_RULE) +_IT_SUBST(INTLTOOL_PROP_RULE) +_IT_SUBST(INTLTOOL_OAF_RULE) +_IT_SUBST(INTLTOOL_PONG_RULE) +_IT_SUBST(INTLTOOL_SERVER_RULE) +_IT_SUBST(INTLTOOL_SHEET_RULE) +_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) +_IT_SUBST(INTLTOOL_UI_RULE) +_IT_SUBST(INTLTOOL_XAM_RULE) +_IT_SUBST(INTLTOOL_KBD_RULE) +_IT_SUBST(INTLTOOL_XML_RULE) +_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) +_IT_SUBST(INTLTOOL_CAVES_RULE) +_IT_SUBST(INTLTOOL_SCHEMAS_RULE) +_IT_SUBST(INTLTOOL_THEME_RULE) +_IT_SUBST(INTLTOOL_SERVICE_RULE) +_IT_SUBST(INTLTOOL_POLICY_RULE) -# Check how to create a tarball. -*- Autoconf -*- +# Check the gettext tools to make sure they are GNU +AC_PATH_PROG(XGETTEXT, xgettext) +AC_PATH_PROG(MSGMERGE, msgmerge) +AC_PATH_PROG(MSGFMT, msgfmt) +AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then + AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) +fi -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +AC_PATH_PROG(INTLTOOL_PERL, perl) +if test -z "$INTLTOOL_PERL"; then + AC_MSG_ERROR([perl not found]) +fi +AC_MSG_CHECKING([for perl >= 5.8.1]) +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 +if test $? -ne 0; then + AC_MSG_ERROR([perl 5.8.1 is required for intltool]) +else + IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" + AC_MSG_RESULT([$IT_PERL_VERSION]) +fi +if test "x$2" != "xno-xml"; then + AC_MSG_CHECKING([for XML::Parser]) + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then + AC_MSG_RESULT([ok]) + else + AC_MSG_ERROR([XML::Parser perl module is required for intltool]) + fi +fi -# serial 2 +# Substitute ALL_LINGUAS so we can use it in po/Makefile +AC_SUBST(ALL_LINGUAS) -# _AM_PROG_TAR(FORMAT) -# -------------------- -# Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. -# -# Substitute a variable $(am__tar) that is a command -# writing to stdout a FORMAT-tarball containing the directory -# $tardir. -# tardir=directory && $(am__tar) > result.tar -# -# Substitute a variable $(am__untar) that extract such -# a tarball read from stdin. -# $(am__untar) < result.tar -AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' +# Set DATADIRNAME correctly if it is not set yet +# (copied from glib-gettext.m4) +if test -z "$DATADIRNAME"; then + AC_LINK_IFELSE( + [AC_LANG_PROGRAM([[]], + [[extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr]])], + [DATADIRNAME=share], + [case $host in + *-*-solaris*) + dnl On Solaris, if bind_textdomain_codeset is in libc, + dnl GNU format message catalog is always supported, + dnl since both are added to the libc all together. + dnl Hence, we'd like to go with DATADIRNAME=share + dnl in this case. + AC_CHECK_FUNC(bind_textdomain_codeset, + [DATADIRNAME=share], [DATADIRNAME=lib]) ;; - none) - am__tar=false - am__tar_=false - am__untar=false + *) + [DATADIRNAME=lib] ;; - esac + esac]) +fi +AC_SUBST(DATADIRNAME) - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +IT_PO_SUBDIR([po]) - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) - rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar /dev/null 2>&1 && break - fi -done -rm -rf conftest.dir +]) + + +# IT_PO_SUBDIR(DIRNAME) +# --------------------- +# All po subdirs have to be declared with this macro; the subdir "po" is +# declared by IT_PROG_INTLTOOL. +# +AC_DEFUN([IT_PO_SUBDIR], +[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. +dnl +dnl The following CONFIG_COMMANDS should be executed at the very end +dnl of config.status. +AC_CONFIG_COMMANDS_PRE([ + AC_CONFIG_COMMANDS([$1/stamp-it], [ + if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then + AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) + fi + rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" + >"$1/stamp-it.tmp" + [sed '/^#/d + s/^[[].*] *// + /^[ ]*$/d + '"s|^| $ac_top_srcdir/|" \ + "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" + ] + [sed '/^POTFILES =/,/[^\\]$/ { + /^POTFILES =/!d + r $1/POTFILES + } + ' "$1/Makefile.in" >"$1/Makefile"] + rm -f "$1/Makefile.tmp" + mv "$1/stamp-it.tmp" "$1/stamp-it" + ]) +])dnl +]) + +# _IT_SUBST(VARIABLE) +# ------------------- +# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# +AC_DEFUN([_IT_SUBST], +[ +AC_SUBST([$1]) +m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) +] +) + +# deprecated macros +AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) +# A hint is needed for aclocal from Automake <= 1.9.4: +# AC_DEFUN([AC_PROG_INTLTOOL], ...) -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) -AC_SUBST([am__tar]) -AC_SUBST([am__untar]) -]) # _AM_PROG_TAR -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 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. @@ -1058,17 +528,17 @@ dnl Authors: dnl Ulrich Drepper , 1995-2000. dnl Bruno Haible , 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(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) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- @@ -1164,562 +634,1088 @@ 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 -# +# 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 "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$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 + +# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# 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.11' +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.11.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_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.11.1])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, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# 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` +]) + + +# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# This was merged into AC_PROG_CC in Autoconf. + +AU_DEFUN([AM_PROG_CC_STDC], +[AC_PROG_CC +AC_DIAGNOSE([obsolete], [$0: + your code should no longer depend upon `am_cv_prog_cc_stdc', but upon + `ac_cv_prog_cc_stdc'. Remove this warning and the assignment when + you adjust the code. You can also remove the above call to + AC_PROG_CC if you already called it elsewhere.]) +am_cv_prog_cc_stdc=$ac_cv_prog_cc_stdc +]) +AU_DEFUN([fp_PROG_CC_STDC]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 9 + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ(2.52)dnl + ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 +# Free Software Foundation, Inc. # -# -------------------------------------------------------------- -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 +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -pkg_failed=no -AC_MSG_CHECKING([for $1]) +# serial 10 -_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) -_PKG_CONFIG([$1][_LIBS], [libs], [$2]) +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... -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 "$2" 2>&1` - else - $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl - m4_default([$4], [AC_MSG_ERROR( -[Package requirements ($2) were not met: +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], UPC, [depcc="$UPC" am_compiler_list=], + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) -$$1_PKG_ERRORS +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) -_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. + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with + # Solaris 8's {/usr,}/bin/sh. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -_PKG_TEXT + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvisualcpp | msvcmsys) + # This compiler won't grok `-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done -To get pkg-config, see .])[]dnl - ]) + cd .. + rm -rf conftest.dir else - $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS - $1[]_LIBS=$pkg_cv_[]$1[]_LIBS - AC_MSG_RESULT([yes]) - $3 -fi[]dnl -])# PKG_CHECK_MODULES + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking speeds up one-time build + --enable-dependency-tracking do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +]) - AC_ARG_WITH([gconf-source], - AC_HELP_STRING([--with-gconf-source=sourceaddress], - [Config database for installing schema files.]), - [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],) +# Generate code to set up dependency tracking. -*- Autoconf -*- - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) +# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi +#serial 5 - AC_ARG_WITH([gconf-schema-file-dir], - AC_HELP_STRING([--with-gconf-schema-file-dir=dir], - [Directory for installing schema files.]), - [GCONF_SCHEMA_FILE_DIR="$withval"],) +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Autoconf 2.62 quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named `Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running `make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n 's/^U = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - AC_ARG_ENABLE(schemas-install, - AC_HELP_STRING([--disable-schemas-install], - [Disable the schemas installation]), - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-install]) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) ]) -# gnome-common.m4 +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. # -# serial 3 -# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl GNOME_COMMON_INIT +# serial 16 -AU_DEFUN([GNOME_COMMON_INIT], -[ - dnl this macro should come after AC_CONFIG_MACRO_DIR - AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0]) +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. - dnl ensure that when the Automake generated makefile calls aclocal, - dnl it honours the $ACLOCAL_FLAGS environment variable - ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}" - if test -n "$ac_macro_dir"; then - ACLOCAL_AMFLAGS="-I $ac_macro_dir $ACLOCAL_AMFLAGS" +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.62])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi +fi - AC_SUBST([ACLOCAL_AMFLAGS]) -], -[[$0: This macro is deprecated. You should set put "ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}" -in your top-level Makefile.am, instead, where "m4" is the macro directory set -with AC_CONFIG_MACRO_DIR() in your configure.ac]]) - -AC_DEFUN([GNOME_DEBUG_CHECK], -[ - AC_ARG_ENABLE([debug], - AC_HELP_STRING([--enable-debug], - [turn on debugging]),, - [enable_debug=no]) - - if test x$enable_debug = xyes ; then - AC_DEFINE(GNOME_ENABLE_DEBUG, 1, - [Enable additional debugging at the expense of performance and size]) - fi -]) +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) -dnl GNOME_MAINTAINER_MODE_DEFINES () -dnl define DISABLE_DEPRECATED -dnl -AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES], -[ - AC_REQUIRE([AM_MAINTAINER_MODE]) +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl - DISABLE_DEPRECATED="" - if test $USE_MAINTAINER_MODE = yes; then - DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP" - for DOMAIN in $DOMAINS; do - DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES" - done - fi +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl - AC_SUBST(DISABLE_DEPRECATED) +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. 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 +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl +dnl The `parallel-tests' driver may need to know about EXEEXT, so add the +dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro +dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl ]) -dnl GNOME_COMPILE_WARNINGS -dnl Turn on many useful compiler warnings -dnl For now, only works on GCC -AC_DEFUN([GNOME_COMPILE_WARNINGS],[ - dnl ****************************** - dnl More compiler warnings - dnl ****************************** +dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - AC_ARG_ENABLE(compile-warnings, - AC_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@], - [Turn on compiler warnings]),, - [enable_compile_warnings="m4_default([$1],[yes])"]) - warnCFLAGS= - if test "x$GCC" != xyes; then - enable_compile_warnings=no - fi +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) - warning_flags= - realsave_CFLAGS="$CFLAGS" +# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - case "$enable_compile_warnings" in - no) - warning_flags= - ;; - minimum) - warning_flags="-Wall" - ;; - yes) - warning_flags="-Wall -Wmissing-prototypes" - ;; - maximum|error) - warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" - CFLAGS="$warning_flags $CFLAGS" - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" - AC_MSG_CHECKING([whether gcc understands $option]) - AC_TRY_COMPILE([], [], - has_option=yes, - has_option=no,) - CFLAGS="$SAVE_CFLAGS" - AC_MSG_RESULT($has_option) - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi - unset has_option - unset SAVE_CFLAGS - done - unset option - if test "$enable_compile_warnings" = "error" ; then - warning_flags="$warning_flags -Werror" - fi - ;; - *) - AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings) - ;; - esac - CFLAGS="$realsave_CFLAGS" - AC_MSG_CHECKING(what warning flags to pass to the C compiler) - AC_MSG_RESULT($warning_flags) +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST(install_sh)]) - AC_ARG_ENABLE(iso-c, - AC_HELP_STRING([--enable-iso-c], - [Try to warn if code is not ISO C ]),, - [enable_iso_c=no]) +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(what language compliance flags to pass to the C compiler) - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then - case " $CFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -ansi" ;; - esac - case " $CFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCFLAGS="$complCFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCFLAGS) +# serial 2 - WARN_CFLAGS="$warning_flags $complCFLAGS" - AC_SUBST(WARN_CFLAGS) -]) +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) -dnl For C++, do basically the same thing. +# Add --enable-maintainer-mode option to configure. -*- Autoconf -*- +# From Jim Meyering -AC_DEFUN([GNOME_CXX_WARNINGS],[ - AC_ARG_ENABLE(cxx-warnings, - AC_HELP_STRING([--enable-cxx-warnings=@<:@no/minimum/yes@:>@] - [Turn on compiler warnings.]),, - [enable_cxx_warnings="m4_default([$1],[minimum])"]) +# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - AC_MSG_CHECKING(what warning flags to pass to the C++ compiler) - warnCXXFLAGS= - if test "x$GXX" != xyes; then - enable_cxx_warnings=no - fi - if test "x$enable_cxx_warnings" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-Wall[\ \ ]*) ;; - *) warnCXXFLAGS="-Wall -Wno-unused" ;; - esac +# serial 5 - ## -W is not all that useful. And it cannot be controlled - ## with individual -Wno-xxx flags, unlike -Wall - if test "x$enable_cxx_warnings" = "xyes"; then - warnCXXFLAGS="$warnCXXFLAGS -Wshadow -Woverloaded-virtual" - fi - fi - fi - AC_MSG_RESULT($warnCXXFLAGS) +# AM_MAINTAINER_MODE([DEFAULT-MODE]) +# ---------------------------------- +# Control maintainer-specific portions of Makefiles. +# Default is to disable them, unless `enable' is passed literally. +# For symmetry, `disable' may be passed as well. Anyway, the user +# can override the default with the --enable/--disable switch. +AC_DEFUN([AM_MAINTAINER_MODE], +[m4_case(m4_default([$1], [disable]), + [enable], [m4_define([am_maintainer_other], [disable])], + [disable], [m4_define([am_maintainer_other], [enable])], + [m4_define([am_maintainer_other], [enable]) + m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])]) +AC_MSG_CHECKING([whether to am_maintainer_other maintainer-specific portions of Makefiles]) + dnl maintainer-mode's default is 'disable' unless 'enable' is passed + AC_ARG_ENABLE([maintainer-mode], +[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + [USE_MAINTAINER_MODE=$enableval], + [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes])) + AC_MSG_RESULT([$USE_MAINTAINER_MODE]) + AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST([MAINT])dnl +] +) - AC_ARG_ENABLE(iso-cxx, - AC_HELP_STRING([--enable-iso-cxx], - [Try to warn if code is not ISO C++ ]),, - [enable_iso_cxx=no]) +AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE]) - AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler) - complCXXFLAGS= - if test "x$enable_iso_cxx" != "xno"; then - if test "x$GXX" = "xyes"; then - case " $CXXFLAGS " in - *[\ \ ]-ansi[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -ansi" ;; - esac +# Check to see how 'make' treats includes. -*- Autoconf -*- - case " $CXXFLAGS " in - *[\ \ ]-pedantic[\ \ ]*) ;; - *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;; - esac - fi - fi - AC_MSG_RESULT($complCXXFLAGS) +# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. - WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS" - AC_SUBST(WARN_CXXFLAGS) -]) +# serial 4 -dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -AC_DEFUN([GNOME_DOC_DEFINES], -[ -AC_ARG_WITH([help-dir], - AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, - [with_help_dir='${datadir}/gnome/help']) -HELP_DIR="$with_help_dir" -AC_SUBST(HELP_DIR) +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from `make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) -AC_ARG_WITH([omf-dir], - AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, - [with_omf_dir='${datadir}/omf']) -OMF_DIR="$with_omf_dir" -AC_SUBST(OMF_DIR) +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -AC_ARG_WITH([help-formats], - AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, - [with_help_formats='']) -DOC_USER_FORMATS="$with_help_formats" -AC_SUBST(DOC_USER_FORMATS) +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_ARG_ENABLE([scrollkeeper], - [AC_HELP_STRING([--disable-scrollkeeper], - [do not make updates to the scrollkeeper database])],, - enable_scrollkeeper=yes) -AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) +# serial 6 -dnl disable scrollkeeper automatically for distcheck -DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) -AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi ]) -# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. # -AC_DEFUN([GNOME_DOC_INIT], -[AC_REQUIRE([AC_PROG_LN_S])dnl - -ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], - [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) -if test "$gdu_cv_have_gdu" = "yes"; then - AC_MSG_RESULT([yes]) - ifelse([$2],,[:],[$2]) -else - AC_MSG_RESULT([no]) - ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -fi +# Helper functions for option handling. -*- Autoconf -*- -GNOME_DOC_DEFINES -]) +# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. +# serial 4 -dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -# serial 40 IT_PROG_INTLTOOL -AC_DEFUN([IT_PROG_INTLTOOL], [ -AC_PREREQ([2.50])dnl -AC_REQUIRE([AM_NLS])dnl +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -case "$am__api_version" in - 1.[01234]) - AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) - ;; - *) - ;; -esac +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -if test -n "$1"; then - AC_MSG_CHECKING([for intltool >= $1]) +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) - INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` - [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` - ] - AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) - test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || - AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -fi +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then - AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -fi +# Check to make sure that the build environment is sane. -*- Autoconf -*- - INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' - INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' - INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' - INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -_IT_SUBST(INTLTOOL_DESKTOP_RULE) -_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -_IT_SUBST(INTLTOOL_KEYS_RULE) -_IT_SUBST(INTLTOOL_PROP_RULE) -_IT_SUBST(INTLTOOL_OAF_RULE) -_IT_SUBST(INTLTOOL_PONG_RULE) -_IT_SUBST(INTLTOOL_SERVER_RULE) -_IT_SUBST(INTLTOOL_SHEET_RULE) -_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -_IT_SUBST(INTLTOOL_UI_RULE) -_IT_SUBST(INTLTOOL_XAM_RULE) -_IT_SUBST(INTLTOOL_KBD_RULE) -_IT_SUBST(INTLTOOL_XML_RULE) -_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -_IT_SUBST(INTLTOOL_CAVES_RULE) -_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -_IT_SUBST(INTLTOOL_THEME_RULE) -_IT_SUBST(INTLTOOL_SERVICE_RULE) -_IT_SUBST(INTLTOOL_POLICY_RULE) +# serial 5 -# Check the gettext tools to make sure they are GNU -AC_PATH_PROG(XGETTEXT, xgettext) -AC_PATH_PROG(MSGMERGE, msgmerge) -AC_PATH_PROG(MSGFMT, msgfmt) -AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi -xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then - AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -fi +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; +esac -AC_PATH_PROG(INTLTOOL_PERL, perl) -if test -z "$INTLTOOL_PERL"; then - AC_MSG_ERROR([perl not found]) -fi -AC_MSG_CHECKING([for perl >= 5.8.1]) -$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -if test $? -ne 0; then - AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -else - IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" - AC_MSG_RESULT([$IT_PERL_VERSION]) -fi -if test "x$2" != "xno-xml"; then - AC_MSG_CHECKING([for XML::Parser]) - if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then - AC_MSG_RESULT([ok]) - else - AC_MSG_ERROR([XML::Parser perl module is required for intltool]) +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` fi -fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then -# Substitute ALL_LINGUAS so we can use it in po/Makefile -AC_SUBST(ALL_LINGUAS) + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) fi -AC_SUBST(DATADIRNAME) +AC_MSG_RESULT(yes)]) -IT_PO_SUBDIR([po]) +# Copyright (C) 2009 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 1 +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# (`yes' being less verbose, `no' or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], +[ --enable-silent-rules less verbose build output (undo: `make V=1') + --disable-silent-rules verbose build output (undo: `make V=0')]) +case $enable_silent_rules in +yes) AM_DEFAULT_VERBOSITY=0;; +no) AM_DEFAULT_VERBOSITY=1;; +*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# IT_PO_SUBDIR(DIRNAME) +# AM_PROG_INSTALL_STRIP # --------------------- -# All po subdirs have to be declared with this macro; the subdir "po" is -# declared by IT_PROG_INTLTOOL. +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006, 2008 Free Software Foundation, Inc. # -AC_DEFUN([IT_PO_SUBDIR], -[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -dnl -dnl The following CONFIG_COMMANDS should be executed at the very end -dnl of config.status. -AC_CONFIG_COMMANDS_PRE([ - AC_CONFIG_COMMANDS([$1/stamp-it], [ - if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then - AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) - fi - rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" - >"$1/stamp-it.tmp" - [sed '/^#/d - s/^[[].*] *// - /^[ ]*$/d - '"s|^| $ac_top_srcdir/|" \ - "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" - ] - [sed '/^POTFILES =/,/[^\\]$/ { - /^POTFILES =/!d - r $1/POTFILES - } - ' "$1/Makefile.in" >"$1/Makefile"] - rm -f "$1/Makefile.tmp" - mv "$1/stamp-it.tmp" "$1/stamp-it" - ]) -])dnl -]) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# _IT_SUBST(VARIABLE) -# ------------------- -# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST +# serial 2 + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. # -AC_DEFUN([_IT_SUBST], -[ -AC_SUBST([$1]) -m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -] -) +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -# deprecated macros -AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -# A hint is needed for aclocal from Automake <= 1.9.4: -# AC_DEFUN([AC_PROG_INTLTOOL], ...) +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR diff --git a/configure b/configure index 0cdd202..dea66a8 100755 --- a/configure +++ b/configure @@ -2111,7 +2111,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;} || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "failed to load site script $ac_site_file -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi done @@ -2335,11 +2335,11 @@ am_lf=' ' case `pwd` in *[\\\"\#\$\&\'\`$am_lf]*) - as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;; + as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;; esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;; esac # Do `set' in a subshell so we don't clobber the current shell's @@ -2667,7 +2667,7 @@ fi # Define the identity of the package. PACKAGE=simple-scan - VERSION=2.32.0 + VERSION=2.32.0.1 cat >>confdefs.h <<_ACEOF @@ -3119,7 +3119,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -3234,7 +3234,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error 77 "C compiler cannot create executables -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -3277,7 +3277,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -3336,7 +3336,7 @@ $as_echo "$ac_try_echo"; } >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi fi fi @@ -3388,7 +3388,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "cannot compute suffix of object files: cannot compile -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -4204,7 +4204,7 @@ fi test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "no acceptable C compiler found in \$PATH -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -4701,7 +4701,7 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } fi ac_ext=c @@ -4991,7 +4991,7 @@ $as_echo "Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files" >& if test "${enable_schemas_install+set}" = set; then : enableval=$enable_schemas_install; case ${enableval} in yes|no) ;; - *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; + *) as_fn_error $? "bad value ${enableval} for --enable-schemas-install" "$LINENO" 5 ;; esac fi @@ -5415,7 +5415,7 @@ and SIMPLE_SCAN_LIBS to avoid the need to call pkg-config. See the pkg-config man page for more details. To get pkg-config, see . -See \`config.log' for more details" "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5 ; } else SIMPLE_SCAN_CFLAGS=$pkg_cv_SIMPLE_SCAN_CFLAGS SIMPLE_SCAN_LIBS=$pkg_cv_SIMPLE_SCAN_LIBS @@ -6917,7 +6917,7 @@ do "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; - *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;; esac done @@ -7124,7 +7124,7 @@ do esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -7152,7 +7152,7 @@ do [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -7179,7 +7179,7 @@ $as_echo "$as_me: creating $ac_file" >&6;} case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac diff --git a/configure.ac b/configure.ac index 3961661..b0ba27a 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.ac) -AM_INIT_AUTOMAKE(simple-scan, 2.32.0) +AM_INIT_AUTOMAKE(simple-scan, 2.32.0.1) AM_MAINTAINER_MODE GNOME_MAINTAINER_MODE_DEFINES m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/help/Makefile.am b/help/Makefile.am index a901f88..135913d 100644 --- a/help/Makefile.am +++ b/help/Makefile.am @@ -21,3 +21,27 @@ DOC_LINGUAS = DISTCLEANFILES = \ Makefile.in + +REAL_LINGUAS = de + +DOC_LINGUAS = POT $(REAL_LINGUAS) + +$(_DOC_LC_DOCS) : po.stamp + +po.stamp: $(wildcard translations/*.po) + for p in $?; do $(mkdir_p) $$(basename $$p .po)/; \ + cp -a $$p $$(basename $$p .po)/; done + touch $@ + +update-pot: translations/simple-scan-help.pot +POT/POT.po: $(foreach page,$(DOC_PAGES),C/$(page)) +translations/simple-scan-help.pot: POT/POT.po + $(mkdir_p) $(dir $@) + sed 's|^#: /.*/\(.*\)|#: \1|g' $^ > $@ + +dist-hook: doc-dist-hook + +EXTRA_DIST = translations po.stamp +DISTCLEANFILES = translations/simple-scan-help.pot + +.PHONY: update-pot diff --git a/help/Makefile.in b/help/Makefile.in index 6920b3c..248730a 100644 --- a/help/Makefile.in +++ b/help/Makefile.in @@ -313,10 +313,10 @@ DOC_PAGES = index.page \ scanner.page \ scanning.page -DOC_LINGUAS = -DISTCLEANFILES = \ - Makefile.in - +DOC_LINGUAS = POT $(REAL_LINGUAS) +DISTCLEANFILES = translations/simple-scan-help.pot +REAL_LINGUAS = de +EXTRA_DIST = translations po.stamp all: all-am .SUFFIXES: @@ -920,6 +920,23 @@ uninstall-doc-omf: dist-hook: doc-dist-hook +$(_DOC_LC_DOCS) : po.stamp + +po.stamp: $(wildcard translations/*.po) + for p in $?; do $(mkdir_p) $$(basename $$p .po)/; \ + cp -a $$p $$(basename $$p .po)/; done + touch $@ + +update-pot: translations/simple-scan-help.pot +POT/POT.po: $(foreach page,$(DOC_PAGES),C/$(page)) +translations/simple-scan-help.pot: POT/POT.po + $(mkdir_p) $(dir $@) + sed 's|^#: /.*/\(.*\)|#: \1|g' $^ > $@ + +dist-hook: doc-dist-hook + +.PHONY: update-pot + # 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. .NOEXPORT: diff --git a/help/POT/POT.po b/help/POT/POT.po new file mode 100644 index 0000000..e5a0ee4 --- /dev/null +++ b/help/POT/POT.po @@ -0,0 +1,228 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2010-10-22 10:11+1100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:6(title) +msgid "0" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:10(title) +msgid "Scanning a Page" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:12(p) +msgid "To scan a document from your scanner:" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:17(p) +msgid "Connect the scanner to your computer." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:22(p) +msgid "Open Simple Scan." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:27(p) +msgid "Press the scan button in the toolbar (or Ctrl1)." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:33(p) +msgid "The page will be shown as it is scanned." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:37(p) +msgid "Each page you scan is added to the end of your document. To start a new document select DocumentNew. Individual pages can be deleted by right clicking a page or pressing the Delete key." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:42(p) +msgid "The type of scan can be changed from the DocumentScan menu. Choose Text if you want the document to be quickly scanned in black and white or Photo for a high resolution color scan." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanning.page:47(p) +msgid "To stop the scan at any time press Escape." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanner.page:9(title) +msgid "Selecting a Scanner" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanner.page:11(p) +msgid "If you have multiple scanners you can change which scanner is selected from the DocumentPreferences menu." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/scanner.page:15(p) +msgid "Your local scanners are automatically detected each time you start Simple Scan and each time you plug in USB scanner. If you have a network scanner you will need to restart Simple Scan for it to be detected." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:9(title) +msgid "Saving to a File" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:11(p) +msgid "To save the current document to a file use the DocumentSave menu (CtrlS). When you save, there is a choice of three file types." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:17(title) +msgid "Portable Document Format (PDF)" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:18(p) +msgid "A PDF can contain multiple pages (like a book) and is easy to distribute to other people. Most people do not have software to modify PDF documents so this format is best used for archiving." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:19(p) +msgid "Use this type if you have scanned multiple pages of text." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:22(title) +msgid "JPEG" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:23(p) +msgid "JPEG file is the file format used by digital cameras and is very small and so easy to distribute. Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites. If you have scanned multiple pages then a JPEG file will be written for each page." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:24(p) +msgid "Use this type if you want to modify or upload the scanned images." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:27(title) +msgid "PNG" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:28(p) +msgid "PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/save.page:29(p) +msgid "Use this type if you need high resolution files for editing" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/rotate.page:9(title) +msgid "Rotating Pages" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/rotate.page:11(p) +msgid "To rotate a page use the rotation buttons in the toolbar or the [ and ] keys. Each new page that is scanned will use the previous rotation." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/reorder.page:9(title) +msgid "Reordering Pages" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/reorder.page:11(p) +msgid "To move a page, select it and move the page left or right using the < and > keys." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/reorder.page:14(p) +msgid "To remove the selected page use the Delete key." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/print.page:9(title) +msgid "Printing" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/print.page:11(p) +msgid "To print the current document use the DocumentPrint menu (CtrlP)." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/email.page:9(title) +msgid "Sending via Email" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/email.page:11(p) +msgid "To email the current document use the DocumentEmail menu (CtrlE). Your email program will be opened with a new message containing the scanned document as an attachment." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/email.page:15(p) +msgid "If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/email.page:18(p) +msgid "See for more information about file formats." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/dpi.page:9(title) +msgid "Setting the Scan Resolution" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/dpi.page:11(p) +msgid "By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi. To change these settings open the preferences from the DocumentPreferences menu." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/crop.page:9(title) +msgid "Cropping" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/crop.page:11(p) +msgid "To use only part of the scanned page enable crop by selecting the crop button in the toolbar. A mask will be shown over the current page with the area not being used shown in gray." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/crop.page:15(p) +msgid "The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/crop.page:18(p) +msgid "Fixed crop sizes can be chosen from the PageCrop menu that match commonly used paper sizes." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/crop.page:21(p) +msgid "Each new page that is scanned will use the previous crop." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/adf.page:9(title) +msgid "Using an Automatic Document Feeder" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/adf.page:11(p) +msgid "If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the DocumentScanAll Pages From Feeder menu." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/adf.page:14(p) +msgid "By default both sides of the paper will be scanned if your scanned supports this. Single side scanning can be configured from the DocumentPreferences menu." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:7(name) +msgid "Robert Ancell" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:8(email) +msgid "robert.ancell@gmail.com" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:13(title) +msgid "Simple Scan Help" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:16(title) +msgid "Scanning Pages" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:20(title) +msgid "Modifying the Document" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/index.page:24(title) +msgid "Using the Document" +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/legal.xml:3(p) +msgid "This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License." +msgstr "" + +#: /home/bob/bzr/simple-scan/help/C/legal.xml:6(p) +msgid "As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: /home/bob/bzr/simple-scan/help/C/legal.xml:0(None) +msgid "translator-credits" +msgstr "" + diff --git a/help/POT/adf.page b/help/POT/adf.page new file mode 100644 index 0000000..f8d527a --- /dev/null +++ b/help/POT/adf.page @@ -0,0 +1,17 @@ + + + + + + + + Using an Automatic Document Feeder + +

+ If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the DocumentScanAll Pages From Feeder menu. +

+

+ By default both sides of the paper will be scanned if your scanned supports this. + Single side scanning can be configured from the DocumentPreferences menu. +

+ diff --git a/help/POT/crop.page b/help/POT/crop.page new file mode 100644 index 0000000..1b08f57 --- /dev/null +++ b/help/POT/crop.page @@ -0,0 +1,23 @@ + + + + + + + + Cropping + +

+ To use only part of the scanned page enable crop by selecting the crop button in the toolbar. + A mask will be shown over the current page with the area not being used shown in gray. +

+

+ The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse. +

+

+ Fixed crop sizes can be chosen from the PageCrop menu that match commonly used paper sizes. +

+

+ Each new page that is scanned will use the previous crop. +

+ diff --git a/help/POT/dpi.page b/help/POT/dpi.page new file mode 100644 index 0000000..4d2ac42 --- /dev/null +++ b/help/POT/dpi.page @@ -0,0 +1,14 @@ + + + + + + + + Setting the Scan Resolution + +

+ By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi. + To change these settings open the preferences from the DocumentPreferences menu. +

+ diff --git a/help/POT/email.page b/help/POT/email.page new file mode 100644 index 0000000..ab4e829 --- /dev/null +++ b/help/POT/email.page @@ -0,0 +1,20 @@ + + + + + + + + Sending via Email + +

+ To email the current document use the DocumentEmail menu (CtrlE). + Your email program will be opened with a new message containing the scanned document as an attachment. +

+

+ If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page. +

+

+ See for more information about file formats. +

+ diff --git a/help/POT/index.page b/help/POT/index.page new file mode 100644 index 0000000..ee74f28 --- /dev/null +++ b/help/POT/index.page @@ -0,0 +1,25 @@ + + + + + + Robert Ancell + robert.ancell@gmail.com + + + + + Simple Scan Help + +
+ Scanning Pages +
+ +
+ Modifying the Document +
+ +
+ Using the Document +
+ diff --git a/help/POT/legal.xml b/help/POT/legal.xml new file mode 100644 index 0000000..46a7e88 --- /dev/null +++ b/help/POT/legal.xml @@ -0,0 +1,9 @@ + + +

This work is licensed under a +Creative Commons +Attribution-Share Alike 3.0 Unported License.

+

As a special exception, the copyright holders give you permission to copy, +modify, and distribute the example code contained in this document under the +terms of your choosing, without restriction.

+ diff --git a/help/POT/print.page b/help/POT/print.page new file mode 100644 index 0000000..aaf6baa --- /dev/null +++ b/help/POT/print.page @@ -0,0 +1,13 @@ + + + + + + + + Printing + +

+ To print the current document use the DocumentPrint menu (CtrlP). +

+ diff --git a/help/POT/reorder.page b/help/POT/reorder.page new file mode 100644 index 0000000..b353801 --- /dev/null +++ b/help/POT/reorder.page @@ -0,0 +1,16 @@ + + + + + + + + Reordering Pages + +

+ To move a page, select it and move the page left or right using the < and > keys. +

+

+ To remove the selected page use the Delete key. +

+ diff --git a/help/POT/rotate.page b/help/POT/rotate.page new file mode 100644 index 0000000..2891582 --- /dev/null +++ b/help/POT/rotate.page @@ -0,0 +1,14 @@ + + + + + + + + Rotating Pages + +

+ To rotate a page use the rotation buttons in the toolbar or the [ and ] keys. + Each new page that is scanned will use the previous rotation. +

+ diff --git a/help/POT/save.page b/help/POT/save.page new file mode 100644 index 0000000..bced8ec --- /dev/null +++ b/help/POT/save.page @@ -0,0 +1,31 @@ + + + + + + + + Saving to a File + +

+ To save the current document to a file use the DocumentSave menu (CtrlS). + When you save, there is a choice of three file types. +

+ + + Portable Document Format (PDF) +

A PDF can contain multiple pages (like a book) and is easy to distribute to other people. Most people do not have software to modify PDF documents so this format is best used for archiving.

+

Use this type if you have scanned multiple pages of text.

+ + + JPEG +

JPEG file is the file format used by digital cameras and is very small and so easy to distribute. Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites. If you have scanned multiple pages then a JPEG file will be written for each page.

+

Use this type if you want to modify or upload the scanned images.

+ + + PNG +

PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page.

+

Use this type if you need high resolution files for editing

+ + + diff --git a/help/POT/scanner.page b/help/POT/scanner.page new file mode 100644 index 0000000..70935c8 --- /dev/null +++ b/help/POT/scanner.page @@ -0,0 +1,18 @@ + + + + + + + + Selecting a Scanner + +

+ If you have multiple scanners you can change which scanner is selected from the DocumentPreferences menu. +

+ +

+ Your local scanners are automatically detected each time you start Simple Scan and each time you plug in USB scanner. + If you have a network scanner you will need to restart Simple Scan for it to be detected. +

+ diff --git a/help/POT/scanning.page b/help/POT/scanning.page new file mode 100644 index 0000000..01ab072 --- /dev/null +++ b/help/POT/scanning.page @@ -0,0 +1,49 @@ + + + + + 0 + + + + Scanning a Page + +

+ To scan a document from your scanner: +

+ + +

+ Connect the scanner to your computer. +

+ + +

+ Open Simple Scan. +

+ + +

+ Press the scan button in the toolbar (or Ctrl1). +

+ + + +

+ The page will be shown as it is scanned. +

+ +

+ Each page you scan is added to the end of your document. To start a new document select DocumentNew. + Individual pages can be deleted by right clicking a page or pressing the Delete key. +

+ +

+ The type of scan can be changed from the DocumentScan menu. + Choose Text if you want the document to be quickly scanned in black and white or Photo for a high resolution color scan. +

+ +

+ To stop the scan at any time press Escape. +

+ diff --git a/help/de/adf.page b/help/de/adf.page new file mode 100644 index 0000000..f8d527a --- /dev/null +++ b/help/de/adf.page @@ -0,0 +1,17 @@ + + + + + + + + Using an Automatic Document Feeder + +

+ If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the DocumentScanAll Pages From Feeder menu. +

+

+ By default both sides of the paper will be scanned if your scanned supports this. + Single side scanning can be configured from the DocumentPreferences menu. +

+ diff --git a/help/de/crop.page b/help/de/crop.page new file mode 100644 index 0000000..1b08f57 --- /dev/null +++ b/help/de/crop.page @@ -0,0 +1,23 @@ + + + + + + + + Cropping + +

+ To use only part of the scanned page enable crop by selecting the crop button in the toolbar. + A mask will be shown over the current page with the area not being used shown in gray. +

+

+ The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse. +

+

+ Fixed crop sizes can be chosen from the PageCrop menu that match commonly used paper sizes. +

+

+ Each new page that is scanned will use the previous crop. +

+ diff --git a/help/de/de.po b/help/de/de.po new file mode 100644 index 0000000..40b36d7 --- /dev/null +++ b/help/de/de.po @@ -0,0 +1,449 @@ +# German translation of the Simple Scan manual. +# Mario Blättermann , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: simple scan docs\n" +"POT-Creation-Date: 2010-10-10 21:55+0200\n" +"PO-Revision-Date: 2010-10-11 20:17+0100\n" +"Last-Translator: Mario Blättermann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" + +#: scanning.page:6(title) +msgid "0" +msgstr "0" + +#: scanning.page:10(title) +msgid "Scanning a Page" +msgstr "Scannen einer Seite" + +#: scanning.page:12(p) +msgid "To scan a document from your scanner:" +msgstr "So scannen Sie ein Dokument mit ihrem Scanner ein:" + +#: scanning.page:17(p) +msgid "Connect the scanner to your computer." +msgstr "Schließen Sie den Scanner an Ihren Rechner an." + +#: scanning.page:23(app) scanner.page:16(app) scanner.page:17(app) +msgid "Simple Scan" +msgstr "Simple Scan" + +#: scanning.page:22(p) +msgid "Open ." +msgstr "Öffnen Sie ." + +#: scanning.page:28(key) save.page:12(key) print.page:12(key) +#: email.page:12(key) +msgid "Ctrl" +msgstr "Strg" + +#: scanning.page:28(key) +msgid "1" +msgstr "1" + +#: scanning.page:27(p) +msgid "" +"Press the scan button in the toolbar (or )." +msgstr "" +"Klicken Sie auf den Scannen-Knopf in der Werkzeugleiste (oder " +")." + +#: scanning.page:33(p) +msgid "The page will be shown as it is scanned." +msgstr "Jede Seite wird so angezeigt, wie sie gescannt wurde." + +#: scanning.page:38(gui) scanning.page:43(gui) scanner.page:12(gui) +#: save.page:12(gui) print.page:12(gui) email.page:12(gui) dpi.page:13(gui) +#: adf.page:12(gui) adf.page:16(gui) +msgid "Document" +msgstr "Dokument" + +#: scanning.page:38(gui) +msgid "New" +msgstr "Neu" + +#: scanning.page:39(key) reorder.page:15(key) +msgid "Delete" +msgstr "Löschen" + +#: scanning.page:37(p) +msgid "" +"Each page you scan is added to the end of your document. To start a new " +"document select . Individual " +"pages can be deleted by right clicking a page or pressing the key." +msgstr "" +"Jede eingescannte Seite wird an das Ende Ihres Dokuments angefügt. Um ein " +"neues Dokument zu beginnen, wählen Sie . Seiten können einzeln entfernt werden, indem Sie mit der rechten " +"Maustaste auf eine Seite klicken oder die -Taste drücken." + +#: scanning.page:43(gui) adf.page:12(gui) +msgid "Scan" +msgstr "Scannen" + +#: scanning.page:44(gui) +msgid "Text" +msgstr "Text" + +#: scanning.page:44(gui) +msgid "Photo" +msgstr "Foto" + +#: scanning.page:42(p) +msgid "" +"The type of scan can be changed from the menu. Choose if you want the " +"document to be quickly scanned in black and white or for a " +"high resolution color scan." +msgstr "" +"Der Scantyp kann im Menü " +"geändert werden. Wählen Sie , wenn das Dokument schnell in " +"Schwarzweiß eingescannt werden soll oder für einen " +"hochauflösenden Farbscan." + +#: scanning.page:48(key) +msgid "Escape" +msgstr "Esc" + +#: scanning.page:47(p) +msgid "To stop the scan at any time press ." +msgstr "Um den Scanvorgang abzubrechen, drücken Sie ." + +#: scanner.page:9(title) +msgid "Selecting a Scanner" +msgstr "Einen Scanner auswählen" + +#: scanner.page:12(gui) dpi.page:13(gui) adf.page:16(gui) +msgid "Preferences" +msgstr "Einstellungen" + +#: scanner.page:11(p) +msgid "" +"If you have multiple scanners you can change which scanner is selected from " +"the menu." +msgstr "" +"Falls Sie über mehrere Scanner verfügen, können Sie im Menü " +" wählen, welcher davon " +"verwendet werden soll." + +#: scanner.page:15(p) +msgid "" +"Your local scanners are automatically detected each time you start " +" and each time you plug in USB scanner. If you have a network " +"scanner you will need to restart for it to be detected." +msgstr "" +"Ihre lokalen Scanner werden jedes Mal beim Start von und bei " +"jedem Anschließen eines USB-Scanners automatisch erkannt. Wenn Sie einen " +"Netzwerkscanner haben, müssen Sie neu starten, damit dieser " +"erkannt werden kann." + +#: save.page:9(title) +msgid "Saving to a File" +msgstr "Speichern in einer Datei" + +#: save.page:12(gui) +msgid "Save" +msgstr "Speichern " + +#: save.page:12(key) +msgid "S" +msgstr "S" + +#: save.page:11(p) +msgid "" +"To save the current document to a file use the menu (). When you save, there is a choice of three file types." +msgstr "" +"Um das aktuelle Dokument zu speichern, wählen Sie (). Beim Speichern können Sie aus drei Dateitypen wählen." + +#: save.page:17(title) +msgid "Portable Document Format (PDF)" +msgstr "Portable Document Format (PDF)" + +#: save.page:18(p) +msgid "" +"A PDF can contain multiple pages (like a book) and is easy to distribute to " +"other people. Most people do not have software to modify PDF documents so " +"this format is best used for archiving." +msgstr "" +"Ein PDF kann mehrere Seiten enthalten (wie ein Buch) und lässt sich auf " +"einfache Art und Weise an Andere weitergeben. Die meisten Benutzer verfügen " +"nicht über Software zum Bearbeiten von PDF-Dokumenten, so dass sich dieses " +"Format bestens zur Archivierung eignet." + +#: save.page:19(p) +msgid "Use this type if you have scanned multiple pages of text." +msgstr "" +"Verwenden Sie diesen Typ, wenn Sie mehrere Textseiten eingescannt haben." + +#: save.page:22(title) +msgid "JPEG" +msgstr "JPEG" + +#: save.page:23(p) +msgid "" +"JPEG file is the file format used by digital cameras and is very small and so " +"easy to distribute. Most people have software to modify JPEG photos and this " +"format is suitable for uploading to social networking sites. If you have " +"scanned multiple pages then a JPEG file will be written for each page." +msgstr "" +"JPEG ist das von Digitalkameras verwendete Dateiformat. Es ist recht klein " +"und bestens für die Weitergabe geeignet. Die meisten Benutzer verfügen über " +"Software zum Bearbeiten von JPEG-Fotos, außerdem lässt es sich einfach auf " +"Webseiten sozialer Netzwerke hochladen. Falls Sie mehrere Seiten eingescannt " +"haben, wird für jede Seite eine JPEG-Datei erzeugt." + +#: save.page:24(p) +msgid "Use this type if you want to modify or upload the scanned images." +msgstr "" +"Verwenden Sie diesen Typ, wenn Sie die eingescannten Bilder bearbeiten oder " +"hochladen wollen." + +#: save.page:27(title) +msgid "PNG" +msgstr "PNG" + +#: save.page:28(p) +msgid "" +"PNG files contain the raw data from the scanner. This makes them much larger " +"than JPEG files and not suitable for distributing. If you have scanned " +"multiple pages then a PNG file will be written for each page." +msgstr "" +"PNG-Dateien enthalten die Rohdaten aus dem Scanner. Dadurch sind sie " +"wesentlich größer als JPEG-Dateien und für die Weitergabe ungeeignet. Wenn " +"Sie mehrere Seiten einscannen, wird für jede Seite eine PNG-Datei erzeugt." + +#: save.page:29(p) +msgid "Use this type if you need high resolution files for editing" +msgstr "" +"Verwenden Sie diesen Typ, wenn sie hochauflösende Dateien zur " +"Weiterverarbeitung benötigen." + +#: rotate.page:9(title) +msgid "Rotating Pages" +msgstr "Seiten drehen" + +#: rotate.page:12(key) +msgid "[" +msgstr "[" + +#: rotate.page:12(key) +msgid "]" +msgstr "]" + +#: rotate.page:11(p) +msgid "" +"To rotate a page use the rotation buttons in the toolbar or the " +" and keys. Each new page that is scanned " +"will use the previous rotation." +msgstr "" +"Um eine Seite zu drehen, verwenden Sie die Drehknöpfe in der Werkzeugleiste " +"oder die Tasten und . Jede neu eingescannte " +"Seite übernimmt dann die gewählte Drehung." + +#: reorder.page:9(title) +msgid "Reordering Pages" +msgstr "Seiten neu anordnen" + +#: reorder.page:12(key) +msgid "<" +msgstr "<" + +#: reorder.page:12(key) +msgid ">" +msgstr ">" + +#: reorder.page:11(p) +msgid "" +"To move a page, select it and move the page left or right using the " +" and keys." +msgstr "" +"Um eine Seite zu verschieben, wählen Sie sie aus und verschieben Sie sie mit " +"den Tasten und nach rechts oder links." + +#: reorder.page:14(p) +msgid "To remove the selected page use the key." +msgstr "" +"Um die ausgewählte Seite zu entfernen, verwenden Sie die -" +"Taste." + +#: print.page:9(title) +msgid "Printing" +msgstr "Drucken" + +#: print.page:12(gui) +msgid "Print" +msgstr "Drucken" + +#: print.page:12(key) +msgid "P" +msgstr "P" + +#: print.page:11(p) +msgid "" +"To print the current document use the menu ()." +msgstr "" +"Um das aktuelle Dokument zu drucken, wählen Sie ()." + +#: index.page:7(name) +msgid "Robert Ancell" +msgstr "Robert Ancell" + +#: index.page:8(email) +msgid "robert.ancell@gmail.com" +msgstr "robert.ancell@gmail.com" + +#: index.page:13(title) +msgid "Simple Scan Help" +msgstr "Hilfe zu Simple Scan" + +#: index.page:16(title) +msgid "Scanning Pages" +msgstr "Scannen von Seiten" + +#: index.page:20(title) +msgid "Modifying the Document" +msgstr "Bearbeiten des Dokuments" + +#: index.page:24(title) +msgid "Using the Document" +msgstr "Das Dokument verwenden" + +#: email.page:9(title) +msgid "Sending via Email" +msgstr "Per E-Mail versenden" + +#: email.page:12(gui) +msgid "Email" +msgstr "E-Mail" + +#: email.page:12(key) +msgid "E" +msgstr "E" + +#: email.page:11(p) +msgid "" +"To email the current document use the menu (). Your " +"email program will be opened with a new message containing the scanned " +"document as an attachment." +msgstr "" +"Um das aktuelle Dokument per E-Mail zu versenden, wählen Sie " +" (). Ihr E-Mail-Programm wird mit einer neuen " +"Nachricht geöffnet, die das eingescannte Dokument als Anhang enthält." + +#: email.page:15(p) +msgid "" +"If the document type is set to text the email will have a PDF attachment " +"otherwise the email will have a JPEG attachment for each page." +msgstr "" +"Falls der Dokumenttyp auf Text gesetzt ist, dann wird der E-Mail-Anhang im " +"PDF-Format versendet, anderenfalls wird für jede Seite ein separater JPEG-" +"Anhang erzeugt." + +#: email.page:18(p) +msgid "See for more information about file formats." +msgstr "" +"In finden Sie weitere Informationen über Dateiformate." + +#: dpi.page:9(title) +msgid "Setting the Scan Resolution" +msgstr "Festlegen der Auflösung" + +#: dpi.page:11(p) +msgid "" +"By default text documents will be scanned at 200 dots per inch (dpi) and " +"photos at 400 dpi. To change these settings open the preferences from the " +" menu." +msgstr "" +"Standardmäßig werden Dokumente mit 200 dpi (Punkte pro Zoll) eingescannt und " +"Fotos mit 400 dpi. Um diese Einstellungen zu ändern, öffnen Sie die " +"Einstellungen mit ." + +#: crop.page:9(title) +msgid "Cropping" +msgstr "Zuschneiden" + +#: crop.page:11(p) +msgid "" +"To use only part of the scanned page enable crop by selecting the crop button " +"in the toolbar. A mask will be shown over the current page with the area not " +"being used shown in gray." +msgstr "" +"Um nur einen Teil der eingescannten Seite zu verwenden, können Sie mit dem " +"Zuschneiden-Knopf in der Werkzeugleiste diese auf die gewünschte Größe " +"zuschneiden. Eine Maske wird über der aktuellen Seite angezeigt, wobei der " +"nicht zu verwendende Teil in Grau dargestellt wird." + +#: crop.page:15(p) +msgid "" +"The crop area can be adjusted by clicking on the inside of the crop area " +"border and dragging the mouse." +msgstr "" +"Sie können den Zuschnittbereich anpassen, indem Sie innerhalb der Umrandung " +"dieses Bereichs mit der Maus klicken und die Maus dann ziehen." + +#: crop.page:19(gui) +msgid "Page" +msgstr "Seite" + +#: crop.page:19(gui) +msgid "Crop" +msgstr "Zuschneiden" + +#: crop.page:18(p) +msgid "" +"Fixed crop sizes can be chosen from the menu that match commonly used paper sizes." +msgstr "" +"Voreingestellte Zuschnittgrößen wählen Sie im Menü , das Ihnen häufig verwendete Papiergrößen zur " +"Auswahl anbietet." + +#: crop.page:21(p) +msgid "Each new page that is scanned will use the previous crop." +msgstr "" +"Jede neu eingescannte Seite verwendet den Zuschnitt der vorherigen Seite." + +#: adf.page:9(title) +msgid "Using an Automatic Document Feeder" +msgstr "Verwendung eines automatischen Dokumenteneinzugs" + +#: adf.page:12(gui) +msgid "All Pages From Feeder" +msgstr "Alle Seiten aus dem Papiereinzug" + +#: adf.page:11(p) +msgid "" +"If your scanner has an Automatic Document Feeder (ADF) you can scan all the " +"pages by selecting the menu." +msgstr "" +"Falls Ihr Scanner mit einem automatischen Dokumenteneinzug ausgestattet ist, " +"wählen Sie im Menü , um alle Seiten einzuscannen." + +#: adf.page:14(p) +msgid "" +"By default both sides of the paper will be scanned if your scanned supports " +"this. Single side scanning can be configured from the menu." +msgstr "" +"Standardmäßig werden beide Seiten des Papiers eingescannt, sofern Ihr Scanner " +"dies unterstützt. Einseitiges Scannen kann über das Menü " +" konfiguriert werden." diff --git a/help/de/dpi.page b/help/de/dpi.page new file mode 100644 index 0000000..4d2ac42 --- /dev/null +++ b/help/de/dpi.page @@ -0,0 +1,14 @@ + + + + + + + + Setting the Scan Resolution + +

+ By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi. + To change these settings open the preferences from the DocumentPreferences menu. +

+ diff --git a/help/de/email.page b/help/de/email.page new file mode 100644 index 0000000..ab4e829 --- /dev/null +++ b/help/de/email.page @@ -0,0 +1,20 @@ + + + + + + + + Sending via Email + +

+ To email the current document use the DocumentEmail menu (CtrlE). + Your email program will be opened with a new message containing the scanned document as an attachment. +

+

+ If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page. +

+

+ See for more information about file formats. +

+ diff --git a/help/de/index.page b/help/de/index.page new file mode 100644 index 0000000..ee74f28 --- /dev/null +++ b/help/de/index.page @@ -0,0 +1,25 @@ + + + + + + Robert Ancell + robert.ancell@gmail.com + + + + + Simple Scan Help + +
+ Scanning Pages +
+ +
+ Modifying the Document +
+ +
+ Using the Document +
+ diff --git a/help/de/legal.xml b/help/de/legal.xml new file mode 100644 index 0000000..46a7e88 --- /dev/null +++ b/help/de/legal.xml @@ -0,0 +1,9 @@ + + +

This work is licensed under a +Creative Commons +Attribution-Share Alike 3.0 Unported License.

+

As a special exception, the copyright holders give you permission to copy, +modify, and distribute the example code contained in this document under the +terms of your choosing, without restriction.

+ diff --git a/help/de/print.page b/help/de/print.page new file mode 100644 index 0000000..aaf6baa --- /dev/null +++ b/help/de/print.page @@ -0,0 +1,13 @@ + + + + + + + + Printing + +

+ To print the current document use the DocumentPrint menu (CtrlP). +

+ diff --git a/help/de/reorder.page b/help/de/reorder.page new file mode 100644 index 0000000..b353801 --- /dev/null +++ b/help/de/reorder.page @@ -0,0 +1,16 @@ + + + + + + + + Reordering Pages + +

+ To move a page, select it and move the page left or right using the < and > keys. +

+

+ To remove the selected page use the Delete key. +

+ diff --git a/help/de/rotate.page b/help/de/rotate.page new file mode 100644 index 0000000..2891582 --- /dev/null +++ b/help/de/rotate.page @@ -0,0 +1,14 @@ + + + + + + + + Rotating Pages + +

+ To rotate a page use the rotation buttons in the toolbar or the [ and ] keys. + Each new page that is scanned will use the previous rotation. +

+ diff --git a/help/de/save.page b/help/de/save.page new file mode 100644 index 0000000..bced8ec --- /dev/null +++ b/help/de/save.page @@ -0,0 +1,31 @@ + + + + + + + + Saving to a File + +

+ To save the current document to a file use the DocumentSave menu (CtrlS). + When you save, there is a choice of three file types. +

+ + + Portable Document Format (PDF) +

A PDF can contain multiple pages (like a book) and is easy to distribute to other people. Most people do not have software to modify PDF documents so this format is best used for archiving.

+

Use this type if you have scanned multiple pages of text.

+ + + JPEG +

JPEG file is the file format used by digital cameras and is very small and so easy to distribute. Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites. If you have scanned multiple pages then a JPEG file will be written for each page.

+

Use this type if you want to modify or upload the scanned images.

+ + + PNG +

PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page.

+

Use this type if you need high resolution files for editing

+ + + diff --git a/help/de/scanner.page b/help/de/scanner.page new file mode 100644 index 0000000..70935c8 --- /dev/null +++ b/help/de/scanner.page @@ -0,0 +1,18 @@ + + + + + + + + Selecting a Scanner + +

+ If you have multiple scanners you can change which scanner is selected from the DocumentPreferences menu. +

+ +

+ Your local scanners are automatically detected each time you start Simple Scan and each time you plug in USB scanner. + If you have a network scanner you will need to restart Simple Scan for it to be detected. +

+ diff --git a/help/de/scanning.page b/help/de/scanning.page new file mode 100644 index 0000000..01ab072 --- /dev/null +++ b/help/de/scanning.page @@ -0,0 +1,49 @@ + + + + + 0 + + + + Scanning a Page + +

+ To scan a document from your scanner: +

+ + +

+ Connect the scanner to your computer. +

+ + +

+ Open Simple Scan. +

+ + +

+ Press the scan button in the toolbar (or Ctrl1). +

+ + + +

+ The page will be shown as it is scanned. +

+ +

+ Each page you scan is added to the end of your document. To start a new document select DocumentNew. + Individual pages can be deleted by right clicking a page or pressing the Delete key. +

+ +

+ The type of scan can be changed from the DocumentScan menu. + Choose Text if you want the document to be quickly scanned in black and white or Photo for a high resolution color scan. +

+ +

+ To stop the scan at any time press Escape. +

+ diff --git a/help/po.stamp b/help/po.stamp new file mode 100644 index 0000000..e69de29 diff --git a/help/translations/de.po b/help/translations/de.po new file mode 100644 index 0000000..40b36d7 --- /dev/null +++ b/help/translations/de.po @@ -0,0 +1,449 @@ +# German translation of the Simple Scan manual. +# Mario Blättermann , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: simple scan docs\n" +"POT-Creation-Date: 2010-10-10 21:55+0200\n" +"PO-Revision-Date: 2010-10-11 20:17+0100\n" +"Last-Translator: Mario Blättermann \n" +"Language-Team: German \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Language: German\n" +"X-Poedit-Country: GERMANY\n" + +#: scanning.page:6(title) +msgid "0" +msgstr "0" + +#: scanning.page:10(title) +msgid "Scanning a Page" +msgstr "Scannen einer Seite" + +#: scanning.page:12(p) +msgid "To scan a document from your scanner:" +msgstr "So scannen Sie ein Dokument mit ihrem Scanner ein:" + +#: scanning.page:17(p) +msgid "Connect the scanner to your computer." +msgstr "Schließen Sie den Scanner an Ihren Rechner an." + +#: scanning.page:23(app) scanner.page:16(app) scanner.page:17(app) +msgid "Simple Scan" +msgstr "Simple Scan" + +#: scanning.page:22(p) +msgid "Open ." +msgstr "Öffnen Sie ." + +#: scanning.page:28(key) save.page:12(key) print.page:12(key) +#: email.page:12(key) +msgid "Ctrl" +msgstr "Strg" + +#: scanning.page:28(key) +msgid "1" +msgstr "1" + +#: scanning.page:27(p) +msgid "" +"Press the scan button in the toolbar (or )." +msgstr "" +"Klicken Sie auf den Scannen-Knopf in der Werkzeugleiste (oder " +")." + +#: scanning.page:33(p) +msgid "The page will be shown as it is scanned." +msgstr "Jede Seite wird so angezeigt, wie sie gescannt wurde." + +#: scanning.page:38(gui) scanning.page:43(gui) scanner.page:12(gui) +#: save.page:12(gui) print.page:12(gui) email.page:12(gui) dpi.page:13(gui) +#: adf.page:12(gui) adf.page:16(gui) +msgid "Document" +msgstr "Dokument" + +#: scanning.page:38(gui) +msgid "New" +msgstr "Neu" + +#: scanning.page:39(key) reorder.page:15(key) +msgid "Delete" +msgstr "Löschen" + +#: scanning.page:37(p) +msgid "" +"Each page you scan is added to the end of your document. To start a new " +"document select . Individual " +"pages can be deleted by right clicking a page or pressing the key." +msgstr "" +"Jede eingescannte Seite wird an das Ende Ihres Dokuments angefügt. Um ein " +"neues Dokument zu beginnen, wählen Sie . Seiten können einzeln entfernt werden, indem Sie mit der rechten " +"Maustaste auf eine Seite klicken oder die -Taste drücken." + +#: scanning.page:43(gui) adf.page:12(gui) +msgid "Scan" +msgstr "Scannen" + +#: scanning.page:44(gui) +msgid "Text" +msgstr "Text" + +#: scanning.page:44(gui) +msgid "Photo" +msgstr "Foto" + +#: scanning.page:42(p) +msgid "" +"The type of scan can be changed from the menu. Choose if you want the " +"document to be quickly scanned in black and white or for a " +"high resolution color scan." +msgstr "" +"Der Scantyp kann im Menü " +"geändert werden. Wählen Sie , wenn das Dokument schnell in " +"Schwarzweiß eingescannt werden soll oder für einen " +"hochauflösenden Farbscan." + +#: scanning.page:48(key) +msgid "Escape" +msgstr "Esc" + +#: scanning.page:47(p) +msgid "To stop the scan at any time press ." +msgstr "Um den Scanvorgang abzubrechen, drücken Sie ." + +#: scanner.page:9(title) +msgid "Selecting a Scanner" +msgstr "Einen Scanner auswählen" + +#: scanner.page:12(gui) dpi.page:13(gui) adf.page:16(gui) +msgid "Preferences" +msgstr "Einstellungen" + +#: scanner.page:11(p) +msgid "" +"If you have multiple scanners you can change which scanner is selected from " +"the menu." +msgstr "" +"Falls Sie über mehrere Scanner verfügen, können Sie im Menü " +" wählen, welcher davon " +"verwendet werden soll." + +#: scanner.page:15(p) +msgid "" +"Your local scanners are automatically detected each time you start " +" and each time you plug in USB scanner. If you have a network " +"scanner you will need to restart for it to be detected." +msgstr "" +"Ihre lokalen Scanner werden jedes Mal beim Start von und bei " +"jedem Anschließen eines USB-Scanners automatisch erkannt. Wenn Sie einen " +"Netzwerkscanner haben, müssen Sie neu starten, damit dieser " +"erkannt werden kann." + +#: save.page:9(title) +msgid "Saving to a File" +msgstr "Speichern in einer Datei" + +#: save.page:12(gui) +msgid "Save" +msgstr "Speichern " + +#: save.page:12(key) +msgid "S" +msgstr "S" + +#: save.page:11(p) +msgid "" +"To save the current document to a file use the menu (). When you save, there is a choice of three file types." +msgstr "" +"Um das aktuelle Dokument zu speichern, wählen Sie (). Beim Speichern können Sie aus drei Dateitypen wählen." + +#: save.page:17(title) +msgid "Portable Document Format (PDF)" +msgstr "Portable Document Format (PDF)" + +#: save.page:18(p) +msgid "" +"A PDF can contain multiple pages (like a book) and is easy to distribute to " +"other people. Most people do not have software to modify PDF documents so " +"this format is best used for archiving." +msgstr "" +"Ein PDF kann mehrere Seiten enthalten (wie ein Buch) und lässt sich auf " +"einfache Art und Weise an Andere weitergeben. Die meisten Benutzer verfügen " +"nicht über Software zum Bearbeiten von PDF-Dokumenten, so dass sich dieses " +"Format bestens zur Archivierung eignet." + +#: save.page:19(p) +msgid "Use this type if you have scanned multiple pages of text." +msgstr "" +"Verwenden Sie diesen Typ, wenn Sie mehrere Textseiten eingescannt haben." + +#: save.page:22(title) +msgid "JPEG" +msgstr "JPEG" + +#: save.page:23(p) +msgid "" +"JPEG file is the file format used by digital cameras and is very small and so " +"easy to distribute. Most people have software to modify JPEG photos and this " +"format is suitable for uploading to social networking sites. If you have " +"scanned multiple pages then a JPEG file will be written for each page." +msgstr "" +"JPEG ist das von Digitalkameras verwendete Dateiformat. Es ist recht klein " +"und bestens für die Weitergabe geeignet. Die meisten Benutzer verfügen über " +"Software zum Bearbeiten von JPEG-Fotos, außerdem lässt es sich einfach auf " +"Webseiten sozialer Netzwerke hochladen. Falls Sie mehrere Seiten eingescannt " +"haben, wird für jede Seite eine JPEG-Datei erzeugt." + +#: save.page:24(p) +msgid "Use this type if you want to modify or upload the scanned images." +msgstr "" +"Verwenden Sie diesen Typ, wenn Sie die eingescannten Bilder bearbeiten oder " +"hochladen wollen." + +#: save.page:27(title) +msgid "PNG" +msgstr "PNG" + +#: save.page:28(p) +msgid "" +"PNG files contain the raw data from the scanner. This makes them much larger " +"than JPEG files and not suitable for distributing. If you have scanned " +"multiple pages then a PNG file will be written for each page." +msgstr "" +"PNG-Dateien enthalten die Rohdaten aus dem Scanner. Dadurch sind sie " +"wesentlich größer als JPEG-Dateien und für die Weitergabe ungeeignet. Wenn " +"Sie mehrere Seiten einscannen, wird für jede Seite eine PNG-Datei erzeugt." + +#: save.page:29(p) +msgid "Use this type if you need high resolution files for editing" +msgstr "" +"Verwenden Sie diesen Typ, wenn sie hochauflösende Dateien zur " +"Weiterverarbeitung benötigen." + +#: rotate.page:9(title) +msgid "Rotating Pages" +msgstr "Seiten drehen" + +#: rotate.page:12(key) +msgid "[" +msgstr "[" + +#: rotate.page:12(key) +msgid "]" +msgstr "]" + +#: rotate.page:11(p) +msgid "" +"To rotate a page use the rotation buttons in the toolbar or the " +" and keys. Each new page that is scanned " +"will use the previous rotation." +msgstr "" +"Um eine Seite zu drehen, verwenden Sie die Drehknöpfe in der Werkzeugleiste " +"oder die Tasten und . Jede neu eingescannte " +"Seite übernimmt dann die gewählte Drehung." + +#: reorder.page:9(title) +msgid "Reordering Pages" +msgstr "Seiten neu anordnen" + +#: reorder.page:12(key) +msgid "<" +msgstr "<" + +#: reorder.page:12(key) +msgid ">" +msgstr ">" + +#: reorder.page:11(p) +msgid "" +"To move a page, select it and move the page left or right using the " +" and keys." +msgstr "" +"Um eine Seite zu verschieben, wählen Sie sie aus und verschieben Sie sie mit " +"den Tasten und nach rechts oder links." + +#: reorder.page:14(p) +msgid "To remove the selected page use the key." +msgstr "" +"Um die ausgewählte Seite zu entfernen, verwenden Sie die -" +"Taste." + +#: print.page:9(title) +msgid "Printing" +msgstr "Drucken" + +#: print.page:12(gui) +msgid "Print" +msgstr "Drucken" + +#: print.page:12(key) +msgid "P" +msgstr "P" + +#: print.page:11(p) +msgid "" +"To print the current document use the menu ()." +msgstr "" +"Um das aktuelle Dokument zu drucken, wählen Sie ()." + +#: index.page:7(name) +msgid "Robert Ancell" +msgstr "Robert Ancell" + +#: index.page:8(email) +msgid "robert.ancell@gmail.com" +msgstr "robert.ancell@gmail.com" + +#: index.page:13(title) +msgid "Simple Scan Help" +msgstr "Hilfe zu Simple Scan" + +#: index.page:16(title) +msgid "Scanning Pages" +msgstr "Scannen von Seiten" + +#: index.page:20(title) +msgid "Modifying the Document" +msgstr "Bearbeiten des Dokuments" + +#: index.page:24(title) +msgid "Using the Document" +msgstr "Das Dokument verwenden" + +#: email.page:9(title) +msgid "Sending via Email" +msgstr "Per E-Mail versenden" + +#: email.page:12(gui) +msgid "Email" +msgstr "E-Mail" + +#: email.page:12(key) +msgid "E" +msgstr "E" + +#: email.page:11(p) +msgid "" +"To email the current document use the menu (). Your " +"email program will be opened with a new message containing the scanned " +"document as an attachment." +msgstr "" +"Um das aktuelle Dokument per E-Mail zu versenden, wählen Sie " +" (). Ihr E-Mail-Programm wird mit einer neuen " +"Nachricht geöffnet, die das eingescannte Dokument als Anhang enthält." + +#: email.page:15(p) +msgid "" +"If the document type is set to text the email will have a PDF attachment " +"otherwise the email will have a JPEG attachment for each page." +msgstr "" +"Falls der Dokumenttyp auf Text gesetzt ist, dann wird der E-Mail-Anhang im " +"PDF-Format versendet, anderenfalls wird für jede Seite ein separater JPEG-" +"Anhang erzeugt." + +#: email.page:18(p) +msgid "See for more information about file formats." +msgstr "" +"In finden Sie weitere Informationen über Dateiformate." + +#: dpi.page:9(title) +msgid "Setting the Scan Resolution" +msgstr "Festlegen der Auflösung" + +#: dpi.page:11(p) +msgid "" +"By default text documents will be scanned at 200 dots per inch (dpi) and " +"photos at 400 dpi. To change these settings open the preferences from the " +" menu." +msgstr "" +"Standardmäßig werden Dokumente mit 200 dpi (Punkte pro Zoll) eingescannt und " +"Fotos mit 400 dpi. Um diese Einstellungen zu ändern, öffnen Sie die " +"Einstellungen mit ." + +#: crop.page:9(title) +msgid "Cropping" +msgstr "Zuschneiden" + +#: crop.page:11(p) +msgid "" +"To use only part of the scanned page enable crop by selecting the crop button " +"in the toolbar. A mask will be shown over the current page with the area not " +"being used shown in gray." +msgstr "" +"Um nur einen Teil der eingescannten Seite zu verwenden, können Sie mit dem " +"Zuschneiden-Knopf in der Werkzeugleiste diese auf die gewünschte Größe " +"zuschneiden. Eine Maske wird über der aktuellen Seite angezeigt, wobei der " +"nicht zu verwendende Teil in Grau dargestellt wird." + +#: crop.page:15(p) +msgid "" +"The crop area can be adjusted by clicking on the inside of the crop area " +"border and dragging the mouse." +msgstr "" +"Sie können den Zuschnittbereich anpassen, indem Sie innerhalb der Umrandung " +"dieses Bereichs mit der Maus klicken und die Maus dann ziehen." + +#: crop.page:19(gui) +msgid "Page" +msgstr "Seite" + +#: crop.page:19(gui) +msgid "Crop" +msgstr "Zuschneiden" + +#: crop.page:18(p) +msgid "" +"Fixed crop sizes can be chosen from the menu that match commonly used paper sizes." +msgstr "" +"Voreingestellte Zuschnittgrößen wählen Sie im Menü , das Ihnen häufig verwendete Papiergrößen zur " +"Auswahl anbietet." + +#: crop.page:21(p) +msgid "Each new page that is scanned will use the previous crop." +msgstr "" +"Jede neu eingescannte Seite verwendet den Zuschnitt der vorherigen Seite." + +#: adf.page:9(title) +msgid "Using an Automatic Document Feeder" +msgstr "Verwendung eines automatischen Dokumenteneinzugs" + +#: adf.page:12(gui) +msgid "All Pages From Feeder" +msgstr "Alle Seiten aus dem Papiereinzug" + +#: adf.page:11(p) +msgid "" +"If your scanner has an Automatic Document Feeder (ADF) you can scan all the " +"pages by selecting the menu." +msgstr "" +"Falls Ihr Scanner mit einem automatischen Dokumenteneinzug ausgestattet ist, " +"wählen Sie im Menü , um alle Seiten einzuscannen." + +#: adf.page:14(p) +msgid "" +"By default both sides of the paper will be scanned if your scanned supports " +"this. Single side scanning can be configured from the menu." +msgstr "" +"Standardmäßig werden beide Seiten des Papiers eingescannt, sofern Ihr Scanner " +"dies unterstützt. Einseitiges Scannen kann über das Menü " +" konfiguriert werden." diff --git a/help/translations/simple-scan-help.pot b/help/translations/simple-scan-help.pot new file mode 100644 index 0000000..10be4e8 --- /dev/null +++ b/help/translations/simple-scan-help.pot @@ -0,0 +1,228 @@ +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2010-10-22 10:11+1100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: scanning.page:6(title) +msgid "0" +msgstr "" + +#: scanning.page:10(title) +msgid "Scanning a Page" +msgstr "" + +#: scanning.page:12(p) +msgid "To scan a document from your scanner:" +msgstr "" + +#: scanning.page:17(p) +msgid "Connect the scanner to your computer." +msgstr "" + +#: scanning.page:22(p) +msgid "Open Simple Scan." +msgstr "" + +#: scanning.page:27(p) +msgid "Press the scan button in the toolbar (or Ctrl1)." +msgstr "" + +#: scanning.page:33(p) +msgid "The page will be shown as it is scanned." +msgstr "" + +#: scanning.page:37(p) +msgid "Each page you scan is added to the end of your document. To start a new document select DocumentNew. Individual pages can be deleted by right clicking a page or pressing the Delete key." +msgstr "" + +#: scanning.page:42(p) +msgid "The type of scan can be changed from the DocumentScan menu. Choose Text if you want the document to be quickly scanned in black and white or Photo for a high resolution color scan." +msgstr "" + +#: scanning.page:47(p) +msgid "To stop the scan at any time press Escape." +msgstr "" + +#: scanner.page:9(title) +msgid "Selecting a Scanner" +msgstr "" + +#: scanner.page:11(p) +msgid "If you have multiple scanners you can change which scanner is selected from the DocumentPreferences menu." +msgstr "" + +#: scanner.page:15(p) +msgid "Your local scanners are automatically detected each time you start Simple Scan and each time you plug in USB scanner. If you have a network scanner you will need to restart Simple Scan for it to be detected." +msgstr "" + +#: save.page:9(title) +msgid "Saving to a File" +msgstr "" + +#: save.page:11(p) +msgid "To save the current document to a file use the DocumentSave menu (CtrlS). When you save, there is a choice of three file types." +msgstr "" + +#: save.page:17(title) +msgid "Portable Document Format (PDF)" +msgstr "" + +#: save.page:18(p) +msgid "A PDF can contain multiple pages (like a book) and is easy to distribute to other people. Most people do not have software to modify PDF documents so this format is best used for archiving." +msgstr "" + +#: save.page:19(p) +msgid "Use this type if you have scanned multiple pages of text." +msgstr "" + +#: save.page:22(title) +msgid "JPEG" +msgstr "" + +#: save.page:23(p) +msgid "JPEG file is the file format used by digital cameras and is very small and so easy to distribute. Most people have software to modify JPEG photos and this format is suitable for uploading to social networking sites. If you have scanned multiple pages then a JPEG file will be written for each page." +msgstr "" + +#: save.page:24(p) +msgid "Use this type if you want to modify or upload the scanned images." +msgstr "" + +#: save.page:27(title) +msgid "PNG" +msgstr "" + +#: save.page:28(p) +msgid "PNG files contain the raw data from the scanner. This makes them much larger than JPEG files and not suitable for distributing. If you have scanned multiple pages then a PNG file will be written for each page." +msgstr "" + +#: save.page:29(p) +msgid "Use this type if you need high resolution files for editing" +msgstr "" + +#: rotate.page:9(title) +msgid "Rotating Pages" +msgstr "" + +#: rotate.page:11(p) +msgid "To rotate a page use the rotation buttons in the toolbar or the [ and ] keys. Each new page that is scanned will use the previous rotation." +msgstr "" + +#: reorder.page:9(title) +msgid "Reordering Pages" +msgstr "" + +#: reorder.page:11(p) +msgid "To move a page, select it and move the page left or right using the < and > keys." +msgstr "" + +#: reorder.page:14(p) +msgid "To remove the selected page use the Delete key." +msgstr "" + +#: print.page:9(title) +msgid "Printing" +msgstr "" + +#: print.page:11(p) +msgid "To print the current document use the DocumentPrint menu (CtrlP)." +msgstr "" + +#: email.page:9(title) +msgid "Sending via Email" +msgstr "" + +#: email.page:11(p) +msgid "To email the current document use the DocumentEmail menu (CtrlE). Your email program will be opened with a new message containing the scanned document as an attachment." +msgstr "" + +#: email.page:15(p) +msgid "If the document type is set to text the email will have a PDF attachment otherwise the email will have a JPEG attachment for each page." +msgstr "" + +#: email.page:18(p) +msgid "See for more information about file formats." +msgstr "" + +#: dpi.page:9(title) +msgid "Setting the Scan Resolution" +msgstr "" + +#: dpi.page:11(p) +msgid "By default text documents will be scanned at 200 dots per inch (dpi) and photos at 400 dpi. To change these settings open the preferences from the DocumentPreferences menu." +msgstr "" + +#: crop.page:9(title) +msgid "Cropping" +msgstr "" + +#: crop.page:11(p) +msgid "To use only part of the scanned page enable crop by selecting the crop button in the toolbar. A mask will be shown over the current page with the area not being used shown in gray." +msgstr "" + +#: crop.page:15(p) +msgid "The crop area can be adjusted by clicking on the inside of the crop area border and dragging the mouse." +msgstr "" + +#: crop.page:18(p) +msgid "Fixed crop sizes can be chosen from the PageCrop menu that match commonly used paper sizes." +msgstr "" + +#: crop.page:21(p) +msgid "Each new page that is scanned will use the previous crop." +msgstr "" + +#: adf.page:9(title) +msgid "Using an Automatic Document Feeder" +msgstr "" + +#: adf.page:11(p) +msgid "If your scanner has an Automatic Document Feeder (ADF) you can scan all the pages by selecting the DocumentScanAll Pages From Feeder menu." +msgstr "" + +#: adf.page:14(p) +msgid "By default both sides of the paper will be scanned if your scanned supports this. Single side scanning can be configured from the DocumentPreferences menu." +msgstr "" + +#: index.page:7(name) +msgid "Robert Ancell" +msgstr "" + +#: index.page:8(email) +msgid "robert.ancell@gmail.com" +msgstr "" + +#: index.page:13(title) +msgid "Simple Scan Help" +msgstr "" + +#: index.page:16(title) +msgid "Scanning Pages" +msgstr "" + +#: index.page:20(title) +msgid "Modifying the Document" +msgstr "" + +#: index.page:24(title) +msgid "Using the Document" +msgstr "" + +#: legal.xml:3(p) +msgid "This work is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License." +msgstr "" + +#: legal.xml:6(p) +msgid "As a special exception, the copyright holders give you permission to copy, modify, and distribute the example code contained in this document under the terms of your choosing, without restriction." +msgstr "" + +#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 +#: legal.xml:0(None) +msgid "translator-credits" +msgstr "" + diff --git a/po/af.po b/po/af.po index 23fed14..b6e216f 100644 --- a/po/af.po +++ b/po/af.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/ar.po b/po/ar.po index befe59e..529800c 100644 --- a/po/ar.po +++ b/po/ar.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/ast.po b/po/ast.po index 90ed748..521ee37 100644 --- a/po/ast.po +++ b/po/ast.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/bg.po b/po/bg.po index d1131b7..634835b 100644 --- a/po/bg.po +++ b/po/bg.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-20 05:36+0000\n" -"PO-Revision-Date: 2010-09-03 13:56+0000\n" +"PO-Revision-Date: 2010-10-17 15:16+0000\n" "Last-Translator: Svetoslav Stefanov \n" "Language-Team: Bulgarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-04 04:57+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -220,7 +220,7 @@ msgstr "_Помощ" #. Radio button for cropping page to US letter size #: ../data/simple-scan.ui.h:79 msgid "_Letter" -msgstr "" +msgstr "_Letter" #. Radio button for no crop #: ../data/simple-scan.ui.h:81 @@ -330,6 +330,8 @@ msgid "" "The height of scanned image in pixels. This value is updated to what the " "last scanned page was." msgstr "" +"Височина на сканираните изображения в пиксели. Тази стойност е обновена до " +"височината на последната сканирана страница." #: ../data/simple-scan.schemas.in.h:15 msgid "" diff --git a/po/ca.po b/po/ca.po index c957bcb..3169a46 100644 --- a/po/ca.po +++ b/po/ca.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-06 05:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/cs.po b/po/cs.po index ad71717..50e8aa3 100644 --- a/po/cs.po +++ b/po/cs.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/da.po b/po/da.po index c31a67b..58280f0 100644 --- a/po/da.po +++ b/po/da.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-08 04:56+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/de.po b/po/de.po index b8a8e50..c712a96 100644 --- a/po/de.po +++ b/po/de.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-02 04:01+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/el.po b/po/el.po index e063cfc..1a743ae 100644 --- a/po/el.po +++ b/po/el.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-27 05:27+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/en_GB.po b/po/en_GB.po index cbad61c..1f46ea7 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/es.po b/po/es.po index ed85210..d4d58c1 100644 --- a/po/es.po +++ b/po/es.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -624,6 +624,7 @@ msgstr "" " FAMM https://launchpad.net/~famm94\n" " Genesis Bustamante https://launchpad.net/~genmarc\n" " Hector Louzao https://launchpad.net/~hhlp\n" +" Jonay https://launchpad.net/~jonay-santana\n" " José Luis Ricón https://launchpad.net/~artirj\n" " Julián Alarcón https://launchpad.net/~alarconj\n" " Martin Albisetti https://launchpad.net/~beuno\n" diff --git a/po/eu.po b/po/eu.po index 08637e6..cc4a117 100644 --- a/po/eu.po +++ b/po/eu.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/fi.po b/po/fi.po index 1b8d4f4..4e4a3e1 100644 --- a/po/fi.po +++ b/po/fi.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/fr.po b/po/fr.po index 797ccfe..74957d8 100644 --- a/po/fr.po +++ b/po/fr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-06 05:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -625,7 +625,7 @@ msgstr "" " Bruno Patri https://launchpad.net/~bruno-patri\n" " François https://launchpad.net/~francois-michonneau\n" " François Tissandier https://launchpad.net/~baloo\n" -" Guillaume Lanquepin https://launchpad.net/~guyomel\n" +" Guillaume Lanquepin-Chesnais https://launchpad.net/~guyomel\n" " Jörg BUCHMANN https://launchpad.net/~jorg-buchmann\n" " Kaïs Bejaoui https://launchpad.net/~kais\n" " Manuel Berrocal https://launchpad.net/~manu-berrocal\n" diff --git a/po/gl.po b/po/gl.po index 8c15b9a..c03610d 100644 --- a/po/gl.po +++ b/po/gl.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-20 05:36+0000\n" -"PO-Revision-Date: 2010-09-18 12:41+0000\n" -"Last-Translator: Francisco Diéguez \n" +"PO-Revision-Date: 2010-09-27 16:10+0000\n" +"Last-Translator: Manuel Xosé Lemos \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-19 05:37+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -502,7 +502,7 @@ msgstr "Non se puido detectar os escáneres" #. Hint to user on why there are no scanners detected #: ../src/ui.c:202 msgid "Please check your scanner is connected and powered on" -msgstr "Verifique que o seu escaner está conectado e aceso" +msgstr "Verifique que o seu escáner está conectado e aceso" #. Save dialog: Label for saving in PDF format #: ../src/ui.c:382 @@ -612,7 +612,7 @@ msgstr "Ferramenta sinxela de escaneo de documentos" msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Francisco Diéguez https://launchpad.net/~frandieguez\n" +" Fran Diéguez https://launchpad.net/~frandieguez\n" " Manuel Xosé Lemos https://launchpad.net/~mxlemos" #. Text in dialog warning when a document is about to be lost diff --git a/po/he.po b/po/he.po index 3e0f917..eb4ee66 100644 --- a/po/he.po +++ b/po/he.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/hr.po b/po/hr.po index 91fd300..600987f 100644 --- a/po/hr.po +++ b/po/hr.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/hu.po b/po/hu.po index d8f22d9..dd26c01 100644 --- a/po/hu.po +++ b/po/hu.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-16 05:14+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/it.po b/po/it.po index 7c90e7c..0402c2e 100644 --- a/po/it.po +++ b/po/it.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-15 05:15+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/ja.po b/po/ja.po index d4c7602..ebd8598 100644 --- a/po/ja.po +++ b/po/ja.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-31 04:06+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/lt.po b/po/lt.po index 2738d51..ea7a647 100644 --- a/po/lt.po +++ b/po/lt.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/ms.po b/po/ms.po index d8566f3..7b66ecf 100644 --- a/po/ms.po +++ b/po/ms.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/nb.po b/po/nb.po index f84c338..5dc29c8 100644 --- a/po/nb.po +++ b/po/nb.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/nl.po b/po/nl.po index af2f2a0..19e7ea3 100644 --- a/po/nl.po +++ b/po/nl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/pl.po b/po/pl.po index b2c0077..d75c6ca 100644 --- a/po/pl.po +++ b/po/pl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/pt.po b/po/pt.po index 667a948..659a057 100644 --- a/po/pt.po +++ b/po/pt.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-20 05:36+0000\n" -"PO-Revision-Date: 2010-06-03 21:51+0000\n" -"Last-Translator: Tiago \n" +"PO-Revision-Date: 2010-10-03 13:57+0000\n" +"Last-Translator: Diogo Lavareda \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -40,7 +40,7 @@ msgstr "A_6" #. Toolbar scan menu item to scan all pages from a document feeder #: ../data/simple-scan.ui.h:10 msgid "All Pages From _Feeder" -msgstr "" +msgstr "Todas as páginas a partir do _Cabeçalho" #. Combo box label for scanning the back side of a page #: ../data/simple-scan.ui.h:12 @@ -72,12 +72,12 @@ msgstr "Le_gal" #: ../data/simple-scan.ui.h:21 msgid "New" -msgstr "" +msgstr "Novo" #. Label beside page size combo box #: ../data/simple-scan.ui.h:23 msgid "Page Size:" -msgstr "" +msgstr "Tamanho da Página:" #. Combo box label for photo scan mode #: ../data/simple-scan.ui.h:25 @@ -92,32 +92,32 @@ msgstr "Preferências" #. Label on rotate page left (anti-clockwise) item #: ../data/simple-scan.ui.h:29 msgid "Rotate Left" -msgstr "" +msgstr "Rodar para a Esquerda" #. Label on rotate page right (clockwise) item #: ../data/simple-scan.ui.h:31 msgid "Rotate Right" -msgstr "" +msgstr "Rodar para a Direita" #. Menu item to rotate page to left (anti-clockwise) #: ../data/simple-scan.ui.h:33 msgid "Rotate _Left" -msgstr "" +msgstr "Rodar para a _Esquerda" #. Menu item to rotate page to right (clockwise) #: ../data/simple-scan.ui.h:35 msgid "Rotate _Right" -msgstr "" +msgstr "Rodar para a _Direita" #. Tooltip for rotate left (counter-clockwise) button #: ../data/simple-scan.ui.h:37 msgid "Rotate the page to the left (counter-clockwise)" -msgstr "" +msgstr "Rodar a página para a esquerda (contra ponteiros do relógio)" #. Tooltip for rotate right (clockwise) button #: ../data/simple-scan.ui.h:39 msgid "Rotate the page to the right (clockwise)" -msgstr "" +msgstr "Rodar a página para a direita (ponteiros do relógio)" #: ../data/simple-scan.ui.h:40 msgid "Save" @@ -126,7 +126,7 @@ msgstr "Guardar" #. Tooltip for save toolbar button #: ../data/simple-scan.ui.h:42 msgid "Save document to a file" -msgstr "" +msgstr "Guardar documento num ficheiro" #. Scan menu item #: ../data/simple-scan.ui.h:44 @@ -136,7 +136,7 @@ msgstr "" #. Label on scan toolbar item #: ../data/simple-scan.ui.h:46 msgid "Scan" -msgstr "" +msgstr "Digitalizar" #. Label beside scan source combo box #: ../data/simple-scan.ui.h:48 @@ -146,7 +146,7 @@ msgstr "Origem da Digitalizaçã_o:" #. Label beside scan side combo box #: ../data/simple-scan.ui.h:50 msgid "Scan Side:" -msgstr "" +msgstr "Lado da digitalização" #. Tooltip for scan toolbar button #: ../data/simple-scan.ui.h:52 @@ -185,7 +185,7 @@ msgstr "Texto" #. Button to submit authorization dialog #: ../data/simple-scan.ui.h:65 msgid "_Authorize" -msgstr "" +msgstr "_Autorizar" #. Help|Contents menu #: ../data/simple-scan.ui.h:67 @@ -195,7 +195,7 @@ msgstr "_Conteúdos" #. Label for page crop submenu #: ../data/simple-scan.ui.h:69 msgid "_Crop" -msgstr "" +msgstr "_Cortar" #. Radio button for cropping to custom page size #: ../data/simple-scan.ui.h:71 @@ -215,17 +215,17 @@ msgstr "" #. Label on help menu #: ../data/simple-scan.ui.h:77 msgid "_Help" -msgstr "" +msgstr "_Ajuda" #. Radio button for cropping page to US letter size #: ../data/simple-scan.ui.h:79 msgid "_Letter" -msgstr "" +msgstr "_Carta" #. Radio button for no crop #: ../data/simple-scan.ui.h:81 msgid "_None" -msgstr "" +msgstr "_Nenhum" #. Page menu (contains action for each page, e.g. delete, crop) #: ../data/simple-scan.ui.h:83 @@ -235,32 +235,32 @@ msgstr "_Página" #. Label beside password entry #: ../data/simple-scan.ui.h:85 msgid "_Password:" -msgstr "" +msgstr "_Palavra-Passe:" #. Label beside scan source combo box #: ../data/simple-scan.ui.h:87 msgid "_Photo Resolution:" -msgstr "" +msgstr "_Resolução da Foto:" #. Menu item to rotate the crop area #: ../data/simple-scan.ui.h:89 msgid "_Rotate Crop" -msgstr "" +msgstr "_Rodar Recorte" #. Menu entry to stop current scan #: ../data/simple-scan.ui.h:91 msgid "_Stop Scan" -msgstr "" +msgstr "_Parar Digitalização" #. Label beside scan source combo box #: ../data/simple-scan.ui.h:93 msgid "_Text Resolution:" -msgstr "" +msgstr "Resolução do _Texto:" #. Label beside username entry #: ../data/simple-scan.ui.h:95 msgid "_Username for resource:" -msgstr "" +msgstr "Nome do _utilizador para o recurso:" #: ../data/simple-scan.desktop.in.h:1 msgid "Scan Documents" @@ -272,43 +272,43 @@ msgstr "" #: ../data/simple-scan.schemas.in.h:2 msgid "Direction of scan" -msgstr "" +msgstr "Direcção da digitalização" #: ../data/simple-scan.schemas.in.h:3 msgid "Directory to save files to" -msgstr "" +msgstr "Pasta para guardar os ficheiros" #: ../data/simple-scan.schemas.in.h:4 msgid "Height of paper in tenths of a mm" -msgstr "" +msgstr "Altura da folha em décimos de mm" #: ../data/simple-scan.schemas.in.h:5 msgid "Height of scanned image in pixels" -msgstr "" +msgstr "Altura da imagem digitalizada em pixeis" #: ../data/simple-scan.schemas.in.h:6 msgid "Page side to scan" -msgstr "" +msgstr "Lado da página a digitalizar" #: ../data/simple-scan.schemas.in.h:7 msgid "Resolution for photo scans" -msgstr "" +msgstr "Resolução para digitalização de fotos" #: ../data/simple-scan.schemas.in.h:8 msgid "Resolution for text scans" -msgstr "" +msgstr "Resolução para digitalização de textos" #: ../data/simple-scan.schemas.in.h:9 msgid "Resolution of last scanned image" -msgstr "" +msgstr "Resolução da última imagem digitalizada" #: ../data/simple-scan.schemas.in.h:10 msgid "SANE device to acquire images from." -msgstr "" +msgstr "Dispositivo SANE para obter imagens" #: ../data/simple-scan.schemas.in.h:11 msgid "TRUE if the application window is maximized" -msgstr "" +msgstr "VERDADE se a janela da aplicação está maximizada." #: ../data/simple-scan.schemas.in.h:12 msgid "" @@ -397,22 +397,22 @@ msgstr "" #. Error displayed when cannot connect to scanner #: ../src/scanner.c:916 msgid "Unable to connect to scanner" -msgstr "" +msgstr "Impossível ligar ao scanner" #. Error display when unable to start scan #: ../src/scanner.c:1222 msgid "Unable to start scan" -msgstr "" +msgstr "Não é possível iniciar a digitalização" #. Error displayed when communication with scanner broken #: ../src/scanner.c:1240 ../src/scanner.c:1346 msgid "Error communicating with scanner" -msgstr "" +msgstr "Erro de comunicação com scanner" #. Title of error dialog when scan failed #: ../src/simple-scan.c:265 msgid "Failed to scan" -msgstr "" +msgstr "Falhou ao digitalizar" #. Default filename to use when saving document (and extension will be added, e.g. .jpg) #: ../src/simple-scan.c:283 @@ -465,12 +465,12 @@ msgstr "" #. Warning displayed when no scanners are detected #: ../src/ui.c:200 msgid "No scanners detected" -msgstr "" +msgstr "Nenhum scanner detectado" #. Hint to user on why there are no scanners detected #: ../src/ui.c:202 msgid "Please check your scanner is connected and powered on" -msgstr "" +msgstr "Verifique se o seu scanner está conectado e ligado" #. Save dialog: Label for saving in PDF format #: ../src/ui.c:382 @@ -557,7 +557,7 @@ msgstr "" #. Title of about dialog #: ../src/ui.c:1275 msgid "About Simple Scan" -msgstr "" +msgstr "Acerca do Simple Scan" #. Description of program #: ../src/ui.c:1278 @@ -569,9 +569,10 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" " Claudio Novais https://launchpad.net/~claudiocn\n" +" Diogo Lavareda https://launchpad.net/~diogolavareda\n" " Luis Pratas https://launchpad.net/~luispratas\n" " Ricardo Conde https://launchpad.net/~turotulco\n" -" Tiago https://launchpad.net/~tiagosilva" +" Tiago Silva https://launchpad.net/~tiagosilva" #. Text in dialog warning when a document is about to be lost #: ../src/ui.c:1305 @@ -605,7 +606,7 @@ msgstr "" #: ../src/ui.c:1478 #, c-format msgid "%d dpi (default)" -msgstr "" +msgstr "%d dpi (predefinido)" #. Title of dialog when cannot load required files #: ../src/ui.c:1523 diff --git a/po/pt_BR.po b/po/pt_BR.po index 21e9540..4d6f2d2 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -611,6 +611,7 @@ msgstr "" "Launchpad Contributions:\n" " André Gondim https://launchpad.net/~andregondim\n" " Benjamim Gois https://launchpad.net/~benjamim-gois\n" +" Celso H. L. S. Junior https://launchpad.net/~celsojunior\n" " Matheus Pacheco de Andrade https://launchpad.net/~matheusp-andrade\n" " Rafael Zenni https://launchpad.net/~rafaeldz\n" " Vitor da Silva Gonçalves https://launchpad.net/~vitorsgoncalves\n" diff --git a/po/ro.po b/po/ro.po index 719833f..20ba261 100644 --- a/po/ro.po +++ b/po/ro.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" "Language: ro\n" diff --git a/po/ru.po b/po/ru.po index 58a38b0..f5c4cb4 100644 --- a/po/ru.po +++ b/po/ru.po @@ -8,13 +8,13 @@ msgstr "" "Project-Id-Version: simple-scan\n" "Report-Msgid-Bugs-To: FULL NAME \n" "POT-Creation-Date: 2010-08-20 05:36+0000\n" -"PO-Revision-Date: 2010-09-25 06:30+0000\n" -"Last-Translator: Dmitri Konoplev \n" +"PO-Revision-Date: 2010-09-27 13:20+0000\n" +"Last-Translator: Dr Gregory House \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-26 05:29+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch @@ -280,7 +280,7 @@ msgstr "Папка для сохранения файлов" #: ../data/simple-scan.schemas.in.h:4 msgid "Height of paper in tenths of a mm" -msgstr "" +msgstr "Высота бумаги в десятых долях мм" #: ../data/simple-scan.schemas.in.h:5 msgid "Height of scanned image in pixels" @@ -336,7 +336,7 @@ msgstr "" msgid "" "The height of the paper in tenths of a mm (or 0 for automatic paper " "detection)." -msgstr "" +msgstr "Высота бумаги в десятках мм (или 0 для автоматического определения)" #: ../data/simple-scan.schemas.in.h:16 msgid "" @@ -370,7 +370,7 @@ msgstr "" msgid "" "The width of the paper in tenths of a mm (or 0 for automatic paper " "detection)." -msgstr "" +msgstr "Ширина бумаги в десятках мм (или 0 для автоматического определения)" #: ../data/simple-scan.schemas.in.h:22 msgid "Type of document being scanned" diff --git a/po/sk.po b/po/sk.po index 192dd2e..c09deaa 100644 --- a/po/sk.po +++ b/po/sk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/sl.po b/po/sl.po index a78ad42..7ba972e 100644 --- a/po/sl.po +++ b/po/sl.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-05 04:55+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/sr.po b/po/sr.po index 9eeefe9..36fd779 100644 --- a/po/sr.po +++ b/po/sr.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/sv.po b/po/sv.po index 30866d9..76aeb66 100644 --- a/po/sv.po +++ b/po/sv.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-07 05:01+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/te.po b/po/te.po index 14f9604..e59fe47 100644 --- a/po/te.po +++ b/po/te.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/tr.po b/po/tr.po index 4706a19..e689ec1 100644 --- a/po/tr.po +++ b/po/tr.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/uk.po b/po/uk.po index 529a4f4..a700303 100644 --- a/po/uk.po +++ b/po/uk.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:02+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/vi.po b/po/vi.po index b310467..e628241 100644 --- a/po/vi.po +++ b/po/vi.po @@ -15,7 +15,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/po/zh_CN.po b/po/zh_CN.po index 35a6ad2..3c32f6e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -14,7 +14,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2010-09-24 05:25+0000\n" +"X-Launchpad-Export-Date: 2010-10-18 05:03+0000\n" "X-Generator: Launchpad (build Unknown)\n" #. Radio button for cropping page to 4x6 inch diff --git a/src/book.c b/src/book.c index b3ec0b6..aced0ad 100644 --- a/src/book.c +++ b/src/book.c @@ -454,7 +454,7 @@ book_save_pdf (Book *book, GFile *file, GError **error) Page *page; GdkPixbuf *image; guchar *pixels, *data, *compressed_data; - gchar *command; + gchar *command, width_buffer[G_ASCII_DTOSTR_BUF_SIZE], height_buffer[G_ASCII_DTOSTR_BUF_SIZE]; const gchar *color_space, *filter = NULL; float page_width, page_height; @@ -620,7 +620,9 @@ book_save_pdf (Book *book, GFile *file, GError **error) pdf_printf (writer, "/Type /Page\n"); pdf_printf (writer, "/Parent %d 0 R\n", pages_number); pdf_printf (writer, "/Resources << /XObject << /Im%d %d 0 R >> >>\n", i, number+1); - pdf_printf (writer, "/MediaBox [ 0 0 %.2f %.2f ]\n", page_width, page_height); + pdf_printf (writer, "/MediaBox [ 0 0 %s %s ]\n", + g_ascii_formatd (width_buffer, sizeof (width_buffer), "%.2f", page_width), + g_ascii_formatd (height_buffer, sizeof (height_buffer), "%.2f", page_height)); pdf_printf (writer, "/Contents %d 0 R\n", number+2); pdf_printf (writer, ">>\n"); pdf_printf (writer, "endobj\n"); @@ -649,9 +651,12 @@ book_save_pdf (Book *book, GFile *file, GError **error) /* Page contents */ command = g_strdup_printf ("q\n" - "%f 0 0 %f 0 0 cm\n" + "%s 0 0 %s 0 0 cm\n" "/Im%d Do\n" - "Q", page_width, page_height, i); + "Q", + g_ascii_formatd (width_buffer, sizeof (width_buffer), "%f", page_width), + g_ascii_formatd (height_buffer, sizeof (height_buffer), "%f", page_height), + i); pdf_printf (writer, "\n"); number = pdf_start_object (writer); pdf_printf (writer, "%d 0 obj\n", number); diff --git a/src/page-view.c b/src/page-view.c index 40823f6..eae49e6 100644 --- a/src/page-view.c +++ b/src/page-view.c @@ -166,18 +166,18 @@ get_pixel (Page *page, gint x, gint y, guchar *pixel) case TOP_TO_BOTTOM: break; case BOTTOM_TO_TOP: - x = page_get_scan_width (page) - x; - y = page_get_scan_height (page) - y; + x = page_get_scan_width (page) - x - 1; + y = page_get_scan_height (page) - y - 1; break; case LEFT_TO_RIGHT: t = x; - x = page_get_scan_width (page) - y; + x = page_get_scan_width (page) - y - 1; y = t; break; case RIGHT_TO_LEFT: t = x; x = y; - y = page_get_scan_height (page) - t; + y = page_get_scan_height (page) - t - 1; break; } @@ -370,7 +370,7 @@ set_pixel (Page *page, blue += p[2] * (T - t); } - if (b != B) { + if (b != B) { get_pixel (page, x, B, p); red += p[0] * (b - B); green += p[1] * (b - B); @@ -387,7 +387,7 @@ set_pixel (Page *page, blue += p[2] * (L - l); } - if (r != R) { + if (r != R) { get_pixel (page, R, y, p); red += p[0] * (r - R); green += p[1] * (r - R); diff --git a/src/page.c b/src/page.c index e70f103..ec21088 100644 --- a/src/page.c +++ b/src/page.c @@ -651,18 +651,18 @@ get_pixel (Page *page, gint x, gint y, guchar *pixel) case TOP_TO_BOTTOM: break; case BOTTOM_TO_TOP: - x = page_get_scan_width (page) - x; - y = page_get_scan_height (page) - y; + x = page_get_scan_width (page) - x - 1; + y = page_get_scan_height (page) - y - 1; break; case LEFT_TO_RIGHT: t = x; - x = page_get_scan_width (page) - y; + x = page_get_scan_width (page) - y - 1; y = t; break; case RIGHT_TO_LEFT: t = x; x = y; - y = page_get_scan_height (page) - t; + y = page_get_scan_height (page) - t - 1; break; } @@ -721,7 +721,7 @@ page_get_image (Page *page, gboolean apply_crop) l = page->priv->crop_x; r = l + page->priv->crop_width; t = page->priv->crop_y; - b = l + page->priv->crop_height; + b = t + page->priv->crop_height; if (l < 0) l = 0; diff --git a/src/scanner.c b/src/scanner.c index f4eb08f..ff8a994 100644 --- a/src/scanner.c +++ b/src/scanner.c @@ -1081,6 +1081,7 @@ do_get_option (Scanner *scanner) "Gray", "Grayscale", SANE_I18N ("Grayscale"), + "True Gray", /* Seen in the proprietary brother3 driver */ NULL }; const char *lineart_scan_modes[] = @@ -1096,8 +1097,9 @@ do_get_option (Scanner *scanner) "Thresholded", SANE_VALUE_SCAN_MODE_GRAY, "Gray", - "Grayscale", + "Grayscale", SANE_I18N ("Grayscale"), + "True Gray", /* Seen in the proprietary brother3 driver */ NULL }; -- cgit v1.2.3