Imported Upstream version 2.32.0.1upstream/2.32.0.1

77 files changed, 2724 insertions, 816 deletions

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