Merge lp:~mterry/ubuntu/maverick/simple-scan/simple-scan-2.32.0 into lp:ubuntu/maverick/simple-scan

[Michael Terry]

GNOME 2.32.0 merge

=== modified file 'NEWS'
--- NEWS	2010-09-05 01:17:06 +0000
+++ NEWS	2010-09-27 13:56:13 +0000
@@ -1,3 +1,7 @@
+Overview of changes in simple-scan 2.32.0
+
+  * Updated translations
+
 Overview of changes in simple-scan 2.31.91
 
   * Allow pages to be reordered

=== modified file 'aclocal.m4'
--- aclocal.m4	2010-09-05 01:17:06 +0000
+++ aclocal.m4	2010-09-27 13:56:13 +0000
@@ -19,686 +19,6 @@
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
 
-dnl 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
-
-  AC_ARG_WITH([gconf-source],
-	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
-			     [Config database for installing schema files.]),
-	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
-  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
-  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-
-  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
-    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
-  fi
-
-  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"],)
-
-  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])
-])
-
-# gnome-common.m4
-# 
-
-dnl GNOME_COMMON_INIT
-
-AC_DEFUN([GNOME_COMMON_INIT],
-[
-  dnl this macro should come after AC_CONFIG_MACRO_DIR
-  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
-
-  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
-
-  AC_SUBST([ACLOCAL_AMFLAGS])
-])
-
-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
-])
-
-dnl GNOME_MAINTAINER_MODE_DEFINES ()
-dnl define DISABLE_DEPRECATED
-dnl
-AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
-[
-	AC_REQUIRE([AM_MAINTAINER_MODE])
-
-	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
-
-	AC_SUBST(DISABLE_DEPRECATED)
-])
-
-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])"])
-
-    warnCFLAGS=
-    if test "x$GCC" != xyes; then
-	enable_compile_warnings=no
-    fi
-
-    warning_flags=
-    realsave_CFLAGS="$CFLAGS"
-
-    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)
-
-    AC_ARG_ENABLE(iso-c,
-                  AC_HELP_STRING([--enable-iso-c],
-                                 [Try to warn if code is not ISO C ]),,
-                  [enable_iso_c=no])
-
-    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)
-
-    WARN_CFLAGS="$warning_flags $complCFLAGS"
-    AC_SUBST(WARN_CFLAGS)
-])
-
-dnl For C++, do basically the same thing.
-
-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])"])
-
-  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
-
-      ## -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)
-
-   AC_ARG_ENABLE(iso-cxx,
-                 AC_HELP_STRING([--enable-iso-cxx],
-                                [Try to warn if code is not ISO C++ ]),,
-                 [enable_iso_cxx=no])
-
-   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
-
-      case " $CXXFLAGS " in
-      *[\ \	]-pedantic[\ \	]*) ;;
-      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
-      esac
-     fi
-   fi
-  AC_MSG_RESULT($complCXXFLAGS)
-
-  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
-  AC_SUBST(WARN_CXXFLAGS)
-])
-
-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)
-
-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)
-
-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)
-
-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"])
-
-dnl disable scrollkeeper automatically for distcheck
-DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
-AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
-
-AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
-])
-
-# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
-#
-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])
-
-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])
-
-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
-
-GNOME_DOC_DEFINES
-])
-
-
-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
-
-if test -n "$1"; then
-    AC_MSG_CHECKING([for intltool >= $1])
-
-    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
-
-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
-
-  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 $< [$]@'
-
-_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 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
-
-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
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-AC_SUBST(ALL_LINGUAS)
-
-# 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])
-fi
-AC_SUBST(DATADIRNAME)
-
-IT_PO_SUBDIR([po])
-
-])
-
-
-# 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], ...)
-
-
-# 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.
-dnl
-dnl This file can can be used in projects which are not available under
-dnl the GNU General Public License or the GNU Library General Public
-dnl License but which still want to provide support for the GNU gettext
-dnl functionality.
-dnl Please note that the actual code of the GNU gettext library is covered
-dnl by the GNU Library General Public License, and the rest of the GNU
-dnl gettext package package is covered by the GNU General Public License.
-dnl They are *not* in the public domain.
-
-dnl Authors:
-dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
-dnl   Bruno Haible <[e-mail]>, 2000-2003.
-
-AC_PREREQ([2.50])
-
-AC_DEFUN([AM_NLS],
-[
-  AC_MSG_CHECKING([whether NLS is requested])
-  dnl Default is enabled NLS
-  AC_ARG_ENABLE([nls],
-    [  --disable-nls           do not use Native Language Support],
-    USE_NLS=$enableval, USE_NLS=yes)
-  AC_MSG_RESULT([$USE_NLS])
-  AC_SUBST([USE_NLS])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# serial 1 (pkg-config-0.24)
-# 
-# Copyright © 2004 Scott James Remnant <[e-mail]>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-# only at the first occurence in configure.ac, so if the first place
-# it's called might be skipped (such as if it is within an "if", you
-# have to call PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_default([$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$$1"; then
-    pkg_cv_[]$1="$$1"
- elif test -n "$PKG_CONFIG"; then
-    PKG_CHECK_EXISTS([$3],
-                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
- else
-    pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# _PKG_SHORT_ERRORS_SUPPORTED
-# -----------------------------
-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
-        _pkg_short_errors_supported=yes
-else
-        _pkg_short_errors_supported=no
-fi[]dnl
-])# _PKG_SHORT_ERRORS_SUPPORTED
-
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
-and $1[]_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.])
-
-if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
-        _PKG_SHORT_ERRORS_SUPPORTED
-        if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$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 <http://pkg-config.freedesktop.org/>.])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
@@ -1719,3 +1039,687 @@
 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.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+dnl
+dnl This file can can be used in projects which are not available under
+dnl the GNU General Public License or the GNU Library General Public
+dnl License but which still want to provide support for the GNU gettext
+dnl functionality.
+dnl Please note that the actual code of the GNU gettext library is covered
+dnl by the GNU Library General Public License, and the rest of the GNU
+dnl gettext package package is covered by the GNU General Public License.
+dnl They are *not* in the public domain.
+
+dnl Authors:
+dnl   Ulrich Drepper <[e-mail]>, 1995-2000.
+dnl   Bruno Haible <[e-mail]>, 2000-2003.
+
+AC_PREREQ(2.50)
+
+AC_DEFUN([AM_NLS],
+[
+  AC_MSG_CHECKING([whether NLS is requested])
+  dnl Default is enabled NLS
+  AC_ARG_ENABLE(nls,
+    [  --disable-nls           do not use Native Language Support],
+    USE_NLS=$enableval, USE_NLS=yes)
+  AC_MSG_RESULT($USE_NLS)
+  AC_SUBST(USE_NLS)
+])
+
+# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
+# serial 1 (pkg-config-0.24)
+# 
+# Copyright © 2004 Scott James Remnant <[e-mail]>.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+# only at the first occurence in configure.ac, so if the first place
+# it's called might be skipped (such as if it is within an "if", you
+# have to call PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+   	AC_MSG_RESULT([no])
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$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 <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+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
+
+  AC_ARG_WITH([gconf-source],
+	      AC_HELP_STRING([--with-gconf-source=sourceaddress],
+			     [Config database for installing schema files.]),
+	      [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
+
+  AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
+  AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
+
+  if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then
+    GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
+  fi
+
+  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"],)
+
+  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])
+])
+
+# gnome-common.m4
+#
+# serial 3
+# 
+
+dnl GNOME_COMMON_INIT
+
+AU_DEFUN([GNOME_COMMON_INIT],
+[
+  dnl this macro should come after AC_CONFIG_MACRO_DIR
+  AC_BEFORE([AC_CONFIG_MACRO_DIR], [$0])
+
+  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
+
+  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
+])
+
+dnl GNOME_MAINTAINER_MODE_DEFINES ()
+dnl define DISABLE_DEPRECATED
+dnl
+AC_DEFUN([GNOME_MAINTAINER_MODE_DEFINES],
+[
+	AC_REQUIRE([AM_MAINTAINER_MODE])
+
+	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
+
+	AC_SUBST(DISABLE_DEPRECATED)
+])
+
+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])"])
+
+    warnCFLAGS=
+    if test "x$GCC" != xyes; then
+	enable_compile_warnings=no
+    fi
+
+    warning_flags=
+    realsave_CFLAGS="$CFLAGS"
+
+    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)
+
+    AC_ARG_ENABLE(iso-c,
+                  AC_HELP_STRING([--enable-iso-c],
+                                 [Try to warn if code is not ISO C ]),,
+                  [enable_iso_c=no])
+
+    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)
+
+    WARN_CFLAGS="$warning_flags $complCFLAGS"
+    AC_SUBST(WARN_CFLAGS)
+])
+
+dnl For C++, do basically the same thing.
+
+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])"])
+
+  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
+
+      ## -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)
+
+   AC_ARG_ENABLE(iso-cxx,
+                 AC_HELP_STRING([--enable-iso-cxx],
+                                [Try to warn if code is not ISO C++ ]),,
+                 [enable_iso_cxx=no])
+
+   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
+
+      case " $CXXFLAGS " in
+      *[\ \	]-pedantic[\ \	]*) ;;
+      *) complCXXFLAGS="$complCXXFLAGS -pedantic" ;;
+      esac
+     fi
+   fi
+  AC_MSG_RESULT($complCXXFLAGS)
+
+  WARN_CXXFLAGS="$CXXFLAGS $warnCXXFLAGS $complCXXFLAGS"
+  AC_SUBST(WARN_CXXFLAGS)
+])
+
+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)
+
+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)
+
+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)
+
+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"])
+
+dnl disable scrollkeeper automatically for distcheck
+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS"
+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS)
+
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+])
+
+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+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])
+
+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])
+
+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
+
+GNOME_DOC_DEFINES
+])
+
+
+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
+
+if test -n "$1"; then
+    AC_MSG_CHECKING([for intltool >= $1])
+
+    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
+
+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
+
+  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 $< [$]@'
+
+_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 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
+
+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
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+AC_SUBST(ALL_LINGUAS)
+
+# 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])
+fi
+AC_SUBST(DATADIRNAME)
+
+IT_PO_SUBDIR([po])
+
+])
+
+
+# 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], ...)
+
+

=== modified file 'configure'
--- configure	2010-09-05 01:17:06 +0000
+++ configure	2010-09-27 13:56:13 +0000
@@ -2111,7 +2111,7 @@
       || { { $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 @@
 '
 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 @@
 
 # Define the identity of the package.
  PACKAGE=simple-scan
- VERSION=2.31.91
+ VERSION=2.32.0
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3119,7 +3119,7 @@
 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 @@
 { { $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 @@
   { { $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 "$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 @@
 { { $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 @@
 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 @@
   { { $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 @@
 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 @@
 See the pkg-config man page for more details.
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-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 @@
     "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 @@
   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 @@
 	   [\\/$]*) 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 @@
 
     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

=== modified file 'configure.ac'
--- configure.ac	2010-09-05 01:17:06 +0000
+++ configure.ac	2010-09-27 13:56:13 +0000
@@ -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.31.91)
+AM_INIT_AUTOMAKE(simple-scan, 2.32.0)
 AM_MAINTAINER_MODE
 GNOME_MAINTAINER_MODE_DEFINES
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

=== modified file 'debian/changelog'
--- debian/changelog	2010-09-05 01:17:06 +0000
+++ debian/changelog	2010-09-27 13:56:13 +0000
@@ -1,3 +1,9 @@
+simple-scan (2.32.0-0ubuntu1) maverick; urgency=low
+
+  * New upstream release.
+
+ -- Michael Terry <[e-mail]>  Mon, 27 Sep 2010 09:49:26 -0400
+
 simple-scan (2.31.91-1ubuntu1) maverick; urgency=low
 
   * Merge with Debian experimental (LP: #628773), remaining changes:

=== modified file 'po/af.po'
--- po/af.po	2010-09-05 01:17:06 +0000
+++ po/af.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/ar.po'
--- po/ar.po	2010-09-05 01:17:06 +0000
+++ po/ar.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/ast.po'
--- po/ast.po	2010-09-05 01:17:06 +0000
+++ po/ast.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/bg.po'
--- po/bg.po	2010-09-05 01:17:06 +0000
+++ po/bg.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-08-14 18:50+0000\n"
+"PO-Revision-Date: 2010-09-03 13:56+0000\n"
 "Last-Translator: Svetoslav Stefanov <[e-mail]>\n"
 "Language-Team: Bulgarian <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-04 04:57+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -40,7 +40,7 @@
 #. 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 "Всички страници от _подавача"
 
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
@@ -126,7 +126,7 @@
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Запис на документа като файл"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -304,11 +304,11 @@
 
 #: ../data/simple-scan.schemas.in.h:10
 msgid "SANE device to acquire images from."
-msgstr ""
+msgstr "SANE устройство, от което да се получи изображението."
 
 #: ../data/simple-scan.schemas.in.h:11
 msgid "TRUE if the application window is maximized"
-msgstr ""
+msgstr "TRUE ако прозореца на приложението е максимизиран."
 
 #: ../data/simple-scan.schemas.in.h:12
 msgid ""
@@ -561,7 +561,7 @@
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
 msgid "Unable to open image preview application"
-msgstr ""
+msgstr "Невъзможно отварянето на приложение за преглед на изображението"
 
 #. Error message displayed when unable to launch help browser
 #: ../src/ui.c:1246
@@ -621,12 +621,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Запис на документа преди излизане?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Излизане без запазване"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449
@@ -670,7 +670,7 @@
 #. Combo box value for automatic paper size
 #: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Автоматично"
 
 #: ../src/ui.c:1866
 msgid "Scanned Document.pdf"

=== modified file 'po/ca.po'
--- po/ca.po	2010-09-05 01:17:06 +0000
+++ po/ca.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-08-23 21:21+0000\n"
-"Last-Translator: Joan Duran <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-05 10:33+0000\n"
+"Last-Translator: David Planella <[e-mail]>\n"
 "Language-Team: Catalan <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -49,7 +49,7 @@
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
-msgstr ""
+msgstr "Escapça"
 
 #: ../data/simple-scan.ui.h:14
 msgid "Crop the selected page"
@@ -555,7 +555,7 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Voleu desar el document actual?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
@@ -627,12 +627,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Voleu desar el document abans de sortir?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Surt sense desar"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449

=== modified file 'po/cs.po'
--- po/cs.po	2010-09-05 01:17:06 +0000
+++ po/cs.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/da.po'
--- po/da.po	2010-09-05 01:17:06 +0000
+++ po/da.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-05-25 09:17+0000\n"
+"PO-Revision-Date: 2010-09-07 18:59+0000\n"
 "Last-Translator: AJenbo <[e-mail]>\n"
 "Language-Team: Danish <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-08 04:56+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -72,7 +72,7 @@
 
 #: ../data/simple-scan.ui.h:21
 msgid "New"
-msgstr "Ny"
+msgstr "Nyt"
 
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
@@ -141,7 +141,7 @@
 #. Label beside scan source combo box
 #: ../data/simple-scan.ui.h:48
 msgid "Scan S_ource:"
-msgstr "Skanner _kilde:"
+msgstr "Skanner_kilde:"
 
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
@@ -156,7 +156,7 @@
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr "Simpel Skanning"
+msgstr "Simpel skanning"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:56
@@ -399,11 +399,11 @@
 
 #: ../data/simple-scan.schemas.in.h:26
 msgid "Window height in pixels"
-msgstr "Vindueahøjde i pixel"
+msgstr "Vindueshøjde i pixel"
 
 #: ../data/simple-scan.schemas.in.h:27
 msgid "Window width in pixels"
-msgstr "Vindueabredde i pixel"
+msgstr "Vinduesbredde i pixel"
 
 #. Error displayed when no scanners to scan with
 #: ../src/scanner.c:889
@@ -491,7 +491,7 @@
 #: ../src/ui.c:151
 #, c-format
 msgid "Username and password required to access '%s'"
-msgstr "Brugernavn og adgangskode er kræves for at tilgå \"%s\""
+msgstr "Brugernavn og adgangskode er krævet for at tilgå \"%s\""
 
 #. Warning displayed when no scanners are detected
 #: ../src/ui.c:200
@@ -546,17 +546,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Hvis du ikke gemmer, vil ændringer gå permanent tabt."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Gem nuværende dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Kassér ændringer"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -600,18 +600,19 @@
 #. Title of about dialog
 #: ../src/ui.c:1275
 msgid "About Simple Scan"
-msgstr "Om Simpel Skanning"
+msgstr "Om Simpel skanning"
 
 #. Description of program
 #: ../src/ui.c:1278
 msgid "Simple document scanning tool"
-msgstr "Simpelt dokument skanningsværktøj"
+msgstr "Simpelt dokumentskanningsværktøj"
 
 #: ../src/ui.c:1287
 msgid "translator-credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  AJenbo https://launchpad.net/~ajenbo\n"
+"  Ask Hjorth Larsen https://launchpad.net/~askhl\n"
 "  David Nielsen https://launchpad.net/~davidnielsen\n"
 "  Kjetil Birkeland Moe https://launchpad.net/~kjetilbmoe\n"
 "  MadsRH https://launchpad.net/~madsrh\n"
@@ -625,7 +626,7 @@
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Afslut uden at gemme"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449

=== modified file 'po/de.po'
--- po/de.po	2010-09-05 01:17:06 +0000
+++ po/de.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-07-17 23:44+0000\n"
-"Last-Translator: Jan-Christoph Borchardt <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-01 21:54+0000\n"
+"Last-Translator: Daniel Schury <[e-mail]>\n"
 "Language-Team: German <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-02 04:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -550,11 +550,12 @@
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
+"Wenn Sie nicht speichern, werden die Änderungen unwiderruflich verworfen."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Aktuelles Dokument speichern?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
@@ -642,12 +643,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Dokument vor dem Beenden speichern?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Beenden ohne zu speichern"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449

=== modified file 'po/el.po'
--- po/el.po	2010-09-05 01:17:06 +0000
+++ po/el.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-03-23 00:21+0000\n"
-"Last-Translator: Thanos Lefteris <Unknown>\n"
+"PO-Revision-Date: 2010-09-26 11:25+0000\n"
+"Last-Translator: Christos Spyroglou <Unknown>\n"
 "Language-Team: Greek <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-27 05:27+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -126,7 +126,7 @@
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Αποθήκευση εγγράφου σε αρχείο"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -617,6 +617,7 @@
 msgstr ""
 "Launchpad Contributions:\n"
 "  Alex Ferguson https://launchpad.net/~thoughtmonster\n"
+"  Christos Spyroglou https://launchpad.net/~cspyroglou\n"
 "  Jennie Petoumenou https://launchpad.net/~jennie\n"
 "  Thanos Lefteris https://launchpad.net/~alefteris"
 

=== modified file 'po/en_GB.po'
--- po/en_GB.po	2010-09-05 01:17:06 +0000
+++ po/en_GB.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/es.po'
--- po/es.po	2010-09-05 01:17:06 +0000
+++ po/es.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/eu.po'
--- po/eu.po	2010-09-05 01:17:06 +0000
+++ po/eu.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/fi.po'
--- po/fi.po	2010-09-05 01:17:06 +0000
+++ po/fi.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/fr.po'
--- po/fr.po	2010-09-05 01:17:06 +0000
+++ po/fr.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-05-21 16:03+0000\n"
-"Last-Translator: Pierre Slamich <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-05 07:41+0000\n"
+"Last-Translator: Bruno Patri <[e-mail]>\n"
 "Language-Team: French <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-06 05:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -147,7 +147,7 @@
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Face à numériser :"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -191,7 +191,7 @@
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:67
 msgid "_Contents"
-msgstr ""
+msgstr "_Contenus"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:69
@@ -555,16 +555,17 @@
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
 msgstr ""
+"Si vous n'enregistrez pas, les modifications seront définitivement perdues."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Enregistrer le document actuel ?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Abandonner les modifications"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -638,12 +639,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Enregistrer le document avant de quitter ?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Quitter sans enregistrer"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449

=== modified file 'po/gl.po'
--- po/gl.po	2010-09-05 01:17:06 +0000
+++ po/gl.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-04-22 12:35+0000\n"
-"Last-Translator: Manuel Xosé Lemos <Unknown>\n"
+"PO-Revision-Date: 2010-09-18 12:41+0000\n"
+"Last-Translator: Francisco Diéguez <Unknown>\n"
 "Language-Team: Galician <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-19 05:37+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Atrás"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Anverso"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Anverso e reverso"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Tamaño da páxina:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,12 +126,12 @@
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Gardar o documento nun ficheiro"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
 msgid "Sc_an"
-msgstr ""
+msgstr "Esc_anear"
 
 #. Label on scan toolbar item
 #: ../data/simple-scan.ui.h:46
@@ -146,7 +146,7 @@
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Cara a escanear:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -190,7 +190,7 @@
 #. Help|Contents menu
 #: ../data/simple-scan.ui.h:67
 msgid "_Contents"
-msgstr ""
+msgstr "_Contidos"
 
 #. Label for page crop submenu
 #: ../data/simple-scan.ui.h:69
@@ -280,7 +280,7 @@
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Altura do papel en décimas de mm"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Cara da páxina a escanear"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -338,11 +338,15 @@
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"A altura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"A cara da páxina que desexe escanear. Pode ser un dos seguintes: «ambos», "
+"«anverso» e «recverso»"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -369,6 +373,8 @@
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"A largura do papel en décimas de mm (ou 0 para a detección automática do "
+"papel)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -386,7 +392,7 @@
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Largura do papel en décimas de mm"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -541,17 +547,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Se non garda o ficheiro, os seus cambios perderanse permanentemente."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Gardar o documento actual?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Rexeitar os cambios"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -612,12 +618,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Gardar o documento antes de saír?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Saír sen gardar"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449
@@ -661,7 +667,7 @@
 #. Combo box value for automatic paper size
 #: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Automático"
 
 #: ../src/ui.c:1866
 msgid "Scanned Document.pdf"

=== modified file 'po/he.po'
--- po/he.po	2010-09-05 01:17:06 +0000
+++ po/he.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/hr.po'
--- po/hr.po	2010-09-05 01:17:06 +0000
+++ po/hr.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/hu.po'
--- po/hu.po	2010-09-05 01:17:06 +0000
+++ po/hu.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-03-31 08:51+0000\n"
-"Last-Translator: Gabor Kelemen <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-15 07:36+0000\n"
+"Last-Translator: Richard Somlói <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-16 05:14+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Hátlap"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Előlap"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Előlap és hátlap"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Oldalméret:"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Dokumentum fájlba mentése"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Oldal szkennelése:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -280,7 +280,7 @@
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "Papír magassága tizedmilliméterben"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"
@@ -288,7 +288,7 @@
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Lapok szkennelendő oldala"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -339,11 +339,14 @@
 "The height of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Papír magassága tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
 #: ../data/simple-scan.schemas.in.h:16
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Lapok szkennelendő oldala. A lehetséges értékek: „both” (mindkettő) „front” "
+"(előlap), „back” (hátlap)"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -370,6 +373,7 @@
 "The width of the paper in tenths of a mm (or 0 for automatic paper "
 "detection)."
 msgstr ""
+"Papír szélessége tizedmilliméterben (0 az automatikus papírfelismeréshez)."
 
 #: ../data/simple-scan.schemas.in.h:22
 msgid "Type of document being scanned"
@@ -387,7 +391,7 @@
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Papír szélessége tizedmilliméterben"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -544,17 +548,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Ha nem ment, akkor a változtatások véglegesen elvesznek."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Mentse az aktuális dokumentumot?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Módosítások eldobása"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -610,6 +614,7 @@
 "Launchpad Contributions:\n"
 "  Gabor Kelemen https://launchpad.net/~kelemeng\n"
 "  Krasznecz Zoltán https://launchpad.net/~krasznecz-zoltan\n"
+"  Papp Bence https://launchpad.net/~sclegnrbs\n"
 "  Pittmann Tamás https://launchpad.net/~zaivaldi\n"
 "  Richard Somlói https://launchpad.net/~ricsipontaz\n"
 "  csola48 https://launchpad.net/~mail-csordaslaszlo"
@@ -617,12 +622,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Menti a dokumentumot kilépés előtt?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Kilépés mentés nélkül"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449
@@ -666,7 +671,7 @@
 #. Combo box value for automatic paper size
 #: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Automatikus"
 
 #: ../src/ui.c:1866
 msgid "Scanned Document.pdf"

=== modified file 'po/it.po'
--- po/it.po	2010-09-05 01:17:06 +0000
+++ po/it.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-08-17 08:12+0000\n"
-"Last-Translator: Paolo Sammicheli <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-14 14:53+0000\n"
+"Last-Translator: Milo Casagrande <[e-mail]>\n"
 "Language-Team: Italian <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-15 05:15+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -387,9 +387,9 @@
 "photos. This setting decides on the scan resolution, colors and post-"
 "processing."
 msgstr ""
-"Tipo documento da acquisire. \"text\" per documenti di testo, \"photo\" per "
-"fotografie. Questa impostazione influenza la risoluzione dell'acquisizione, "
-"le impostazioni di colore e la post-produzione."
+"Tipo di documento da acquisire. \"text\" per documenti di testo, \"photo\" "
+"per fotografie. Questa impostazione influenza la risoluzione "
+"dell'acquisizione, le impostazioni di colore e la post-produzione."
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
@@ -625,6 +625,7 @@
 "  Giasone https://launchpad.net/~giasone\n"
 "  Luca Reverberi https://launchpad.net/~ilreve\n"
 "  Marco Lazzaroni https://launchpad.net/~marcolazzaroni\n"
+"  Milo Casagrande https://launchpad.net/~milo\n"
 "  Paolo Sammicheli https://launchpad.net/~xdatap1\n"
 "  Vincenzo Ninni https://launchpad.net/~wampon\n"
 "  alexinfurs https://launchpad.net/~alexinfurs\n"

=== modified file 'po/ja.po'
--- po/ja.po	2010-09-05 01:17:06 +0000
+++ po/ja.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-06-17 01:01+0000\n"
+"PO-Revision-Date: 2010-08-30 16:07+0000\n"
 "Last-Translator: Shushi Kurose <[e-mail]>\n"
 "Language-Team: Japanese <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-31 04:06+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -280,7 +280,7 @@
 
 #: ../data/simple-scan.schemas.in.h:4
 msgid "Height of paper in tenths of a mm"
-msgstr ""
+msgstr "10mm単位の用紙の高さ"
 
 #: ../data/simple-scan.schemas.in.h:5
 msgid "Height of scanned image in pixels"

=== modified file 'po/lt.po'
--- po/lt.po	2010-09-05 01:17:06 +0000
+++ po/lt.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/ms.po'
--- po/ms.po	2010-09-05 01:17:06 +0000
+++ po/ms.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/nb.po'
--- po/nb.po	2010-09-05 01:17:06 +0000
+++ po/nb.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/nl.po'
--- po/nl.po	2010-09-05 01:17:06 +0000
+++ po/nl.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/pl.po'
--- po/pl.po	2010-09-05 01:17:06 +0000
+++ po/pl.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/pt.po'
--- po/pt.po	2010-09-05 01:17:06 +0000
+++ po/pt.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2010-09-05 01:17:06 +0000
+++ po/pt_BR.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/ro.po'
--- po/ro.po	2010-09-05 01:17:06 +0000
+++ po/ro.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: ro\n"
 

=== modified file 'po/ru.po'
--- po/ru.po	2010-09-05 01:17:06 +0000
+++ po/ru.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-04-10 14:59+0000\n"
-"Last-Translator: Alexandre Prokoudine <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-25 06:30+0000\n"
+"Last-Translator: Dmitri Konoplev <Unknown>\n"
 "Language-Team: Russian <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-26 05:29+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -45,7 +45,7 @@
 #. Combo box label for scanning the back side of a page
 #: ../data/simple-scan.ui.h:12
 msgid "Back"
-msgstr ""
+msgstr "Обратная сторона"
 
 #: ../data/simple-scan.ui.h:13
 msgid "Crop"
@@ -58,12 +58,12 @@
 #. Combo box label for scanning the front side of a page
 #: ../data/simple-scan.ui.h:16
 msgid "Front"
-msgstr ""
+msgstr "Лицевая сторона"
 
 #. Combo box label for scanning both sides of a page
 #: ../data/simple-scan.ui.h:18
 msgid "Front and Back"
-msgstr ""
+msgstr "Обе стороны"
 
 #. Radio button for cropping to page to US legal size
 #: ../data/simple-scan.ui.h:20
@@ -77,7 +77,7 @@
 #. Label beside page size combo box
 #: ../data/simple-scan.ui.h:23
 msgid "Page Size:"
-msgstr ""
+msgstr "Размер листа"
 
 #. Combo box label for photo scan mode
 #: ../data/simple-scan.ui.h:25
@@ -126,7 +126,7 @@
 #. Tooltip for save toolbar button
 #: ../data/simple-scan.ui.h:42
 msgid "Save document to a file"
-msgstr ""
+msgstr "Сохранить документ в файл"
 
 #. Scan menu item
 #: ../data/simple-scan.ui.h:44
@@ -146,7 +146,7 @@
 #. Label beside scan side combo box
 #: ../data/simple-scan.ui.h:50
 msgid "Scan Side:"
-msgstr ""
+msgstr "Сканируемая сторона:"
 
 #. Tooltip for scan toolbar button
 #: ../data/simple-scan.ui.h:52
@@ -288,7 +288,7 @@
 
 #: ../data/simple-scan.schemas.in.h:6
 msgid "Page side to scan"
-msgstr ""
+msgstr "Сторона страницы для сканирования"
 
 #: ../data/simple-scan.schemas.in.h:7
 msgid "Resolution for photo scans"
@@ -342,6 +342,8 @@
 msgid ""
 "The page side to scan. It can be one of the following: 'both' 'front' 'back'"
 msgstr ""
+"Сторона страницы для сканирования. Может быть: 'с обоих сторон', 'лицевая', "
+"'обратная'"
 
 #: ../data/simple-scan.schemas.in.h:17
 msgid "The resolution in dots-per-inch of the previously scanned image."
@@ -386,7 +388,7 @@
 
 #: ../data/simple-scan.schemas.in.h:24
 msgid "Width of paper in tenths of a mm"
-msgstr ""
+msgstr "Ширина бумаги, см"
 
 #: ../data/simple-scan.schemas.in.h:25
 msgid "Width of scanned image in pixels"
@@ -539,17 +541,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Если не выполнить сохранение, все изменения будут утеряны."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Сохранить текущий документ?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Отменить изменения"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -607,7 +609,10 @@
 "  Alexander Telenga https://launchpad.net/~telenga\n"
 "  Alexandre Prokoudine https://launchpad.net/~alexandre-prokoudine\n"
 "  Alexey Kotlyarov https://launchpad.net/~koterpillar\n"
+"  Alsvartr https://launchpad.net/~pavel-nazarov\n"
 "  Andrew Sudarikov https://launchpad.net/~andrey-interra\n"
+"  Dmitri Konoplev https://launchpad.net/~knoplef\n"
+"  KEIII https://launchpad.net/~cashagent\n"
 "  Oleg https://launchpad.net/~oleg-devyatilov\n"
 "  Oleg Koptev https://launchpad.net/~koptev-oleg\n"
 "  Артём Попов https://launchpad.net/~artfwo"
@@ -615,12 +620,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Сохранить документ перед выходом?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Выйти без сохранения"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449
@@ -664,7 +669,7 @@
 #. Combo box value for automatic paper size
 #: ../src/ui.c:1588
 msgid "Automatic"
-msgstr ""
+msgstr "Выбрать автоматически"
 
 #: ../src/ui.c:1866
 msgid "Scanned Document.pdf"

=== modified file 'po/sk.po'
--- po/sk.po	2010-09-05 01:17:06 +0000
+++ po/sk.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/sl.po'
--- po/sl.po	2010-09-05 01:17:06 +0000
+++ po/sl.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-08-16 11:48+0000\n"
-"Last-Translator: Andrej Znidarsic <[e-mail]>\n"
+"PO-Revision-Date: 2010-09-04 07:44+0000\n"
+"Last-Translator: Klemen Košir <[e-mail]>\n"
 "Language-Team: Slovenian <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-05 04:55+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -601,7 +601,7 @@
 #. Title of about dialog
 #: ../src/ui.c:1275
 msgid "About Simple Scan"
-msgstr "O Programu"
+msgstr "O programu"
 
 #. Description of program
 #: ../src/ui.c:1278
@@ -613,6 +613,7 @@
 msgstr ""
 "Launchpad Contributions:\n"
 "  Andrej Znidarsic https://launchpad.net/~andrej.znidarsic\n"
+"  Klemen Košir https://launchpad.net/~klemen913\n"
 "  Robert Hrovat https://launchpad.net/~robi-hipnos\n"
 "  grofaty https://launchpad.net/~grofaty"
 

=== modified file 'po/sr.po'
--- po/sr.po	2010-09-05 01:17:06 +0000
+++ po/sr.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/sv.po'
--- po/sv.po	2010-09-05 01:17:06 +0000
+++ po/sv.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-06-27 08:29+0000\n"
+"PO-Revision-Date: 2010-09-06 06:05+0000\n"
 "Last-Translator: Daniel Nylander <[e-mail]>\n"
 "Language-Team: Swedish <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-07 05:01+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -156,7 +156,7 @@
 #. Title of scan window
 #: ../data/simple-scan.ui.h:54 ../data/simple-scan.desktop.in.h:2
 msgid "Simple Scan"
-msgstr "Simple Scan"
+msgstr "Enkel bildinläsning"
 
 #. Toolbar scan menu item to scan a single page from the scanner
 #: ../data/simple-scan.ui.h:56
@@ -547,17 +547,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "Om du inte sparar så kommer ändringarna att gå förlorade."
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "Spara aktuellt dokument?"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "Förkasta ändringar"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -602,7 +602,7 @@
 #. Title of about dialog
 #: ../src/ui.c:1275
 msgid "About Simple Scan"
-msgstr "Om Simple Scan"
+msgstr "Om Enkel bildinläsning"
 
 #. Description of program
 #: ../src/ui.c:1278
@@ -621,12 +621,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "Spara dokumment innan du avslutar?"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "Avsluta utan att spara"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449

=== modified file 'po/te.po'
--- po/te.po	2010-09-05 01:17:06 +0000
+++ po/te.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/tr.po'
--- po/tr.po	2010-09-05 01:17:06 +0000
+++ po/tr.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/uk.po'
--- po/uk.po	2010-09-05 01:17:06 +0000
+++ po/uk.po	2010-09-27 13:56:13 +0000
@@ -14,7 +14,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/vi.po'
--- po/vi.po	2010-09-05 01:17:06 +0000
+++ po/vi.po	2010-09-27 13:56:13 +0000
@@ -15,7 +15,7 @@
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2010-08-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-08-30 04:09+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch

=== modified file 'po/zh_CN.po'
--- po/zh_CN.po	2010-09-05 01:17:06 +0000
+++ po/zh_CN.po	2010-09-27 13:56:13 +0000
@@ -8,13 +8,13 @@
 "Project-Id-Version: simple-scan\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2010-08-20 05:36+0000\n"
-"PO-Revision-Date: 2010-06-13 05:56+0000\n"
+"PO-Revision-Date: 2010-09-22 03:32+0000\n"
 "Last-Translator: Xhacker Liu <[e-mail]>\n"
 "Language-Team: Chinese (Simplified) <[e-mail]>\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-27 03:48+0000\n"
+"X-Launchpad-Export-Date: 2010-09-24 05:25+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. Radio button for cropping page to 4x6 inch
@@ -528,17 +528,17 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:552
 msgid "If you don't save, changes will be permanently lost."
-msgstr ""
+msgstr "如果您不保存，变更将永久丢失。"
 
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:594
 msgid "Save current document?"
-msgstr ""
+msgstr "保存当前文档？"
 
 #. Button in dialog to create new document and discard unsaved document
 #: ../src/ui.c:596
 msgid "Discard Changes"
-msgstr ""
+msgstr "放弃更改"
 
 #. Error message display when unable to preview image
 #: ../src/ui.c:950
@@ -601,12 +601,12 @@
 #. Text in dialog warning when a document is about to be lost
 #: ../src/ui.c:1305
 msgid "Save document before quitting?"
-msgstr ""
+msgstr "退出前保存文档？"
 
 #. Button in dialog to quit and discard unsaved document
 #: ../src/ui.c:1307
 msgid "Quit without Saving"
-msgstr ""
+msgstr "退出且不保存"
 
 #. Preferences dialog: Label for minimum resolution in resolution list
 #: ../src/ui.c:1449